Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								a5b1af4999 
								
							 
						 
						
							
							
								
								Normalize line endings  
							
							
							
						 
						
							2016-08-27 18:40:50 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								2e3834edea 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into makefile_overhaul  
							
							
							
						 
						
							2016-08-24 10:37:02 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								a920548471 
								
							 
						 
						
							
							
								
								Merge pull request  #677  from SmackleFunky/master  
							
							... 
							
							
							
							Virtual Serial Port - and a Layout that uses that virtual serial port for Plover 
							
						 
						
							2016-08-23 11:05:26 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Green 
								
							 
						 
						
							
							
							
							
								
							
							
								7009112752 
								
							 
						 
						
							
							
								
								move to ergodox-ez only  
							
							
							
						 
						
							2016-08-23 07:04:55 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								8f2af3c6bc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into makefile_overhaul  
							
							
							
						 
						
							2016-08-23 09:38:05 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								fb4452c2f5 
								
							 
						 
						
							
							
								
								Merge pull request  #671  from Talljoe/one-hand  
							
							... 
							
							
							
							Add native one-handed support 
							
						 
						
							2016-08-23 00:29:46 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Green 
								
							 
						 
						
							
							
							
							
								
							
							
								80d10bef07 
								
							 
						 
						
							
							
								
								Added USB Virtual Serial support  
							
							
							
						 
						
							2016-08-23 04:16:35 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joe Wasson 
								
							 
						 
						
							
							
							
							
								
							
							
								8090f6b499 
								
							 
						 
						
							
							
								
								Improve one-hand support by adding more actions and tap keys.  
							
							
							
						 
						
							2016-08-20 17:46:53 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joe Wasson 
								
							 
						 
						
							
							
							
							
								
							
							
								dd37860160 
								
							 
						 
						
							
							
								
								Add one-hand support.  
							
							... 
							
							
							
							This adds an action, `ACTION_SWAP_HANDS`, that swaps the the keys on the keyboard across a keymap-defined hemisphere in order to support one-hand typing without requiring a separate one-handed layer. See updated `doc/keymap.md` for more information. 
							
						 
						
							2016-08-20 17:46:53 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								fd2f957a1a 
								
							 
						 
						
							
							
								
								Normalize line endings  
							
							
							
						 
						
							2016-08-20 17:59:18 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								48f8ab1ae2 
								
							 
						 
						
							
							
								
								Fix the clean target  
							
							... 
							
							
							
							It now properly cleans all the outputs 
							
						 
						
							2016-08-20 12:44:04 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								3442e216dc 
								
							 
						 
						
							
							
								
								Move bootloader_defs include to build_keyboard  
							
							... 
							
							
							
							Also fix it for subprojects 
							
						 
						
							2016-08-20 03:56:42 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								9028a412ea 
								
							 
						 
						
							
							
								
								Add output specific config file  
							
							
							
						 
						
							2016-08-20 03:56:41 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								33fbd3be36 
								
							 
						 
						
							
							
								
								Output specific include paths  
							
							
							
						 
						
							2016-08-20 03:56:40 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								3aac4e95c9 
								
							 
						 
						
							
							
								
								More general system for generating several outputs  
							
							
							
						 
						
							2016-08-20 03:56:39 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								dd8c1a7659 
								
							 
						 
						
							
							
								
								Don't add VERSION as a define  
							
							... 
							
							
							
							To avoid full recompilation when the git commit hash changes. 
							
						 
						
							2016-08-20 03:56:33 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								60c6e79ecb 
								
							 
						 
						
							
							
								
								Move git submodule check and version generation to main Makefile  
							
							
							
						 
						
							2016-08-20 03:56:32 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								cc2df445ab 
								
							 
						 
						
							
							
								
								Remove unneded code from tmk_core/rules.mk  
							
							
							
						 
						
							2016-08-20 03:56:31 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									di0ib 
								
							 
						 
						
							
							
							
							
								
							
							
								8fab141a02 
								
							 
						 
						
							
							
								
								Convert hex to bin  
							
							... 
							
							
							
							For flashing via alternative methods like LUFA MassStorage bootloader. 
							
						 
						
							2016-08-07 20:58:59 -10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								a0dc622199 
								
							 
						 
						
							
							
								
								Remove the quick commands and add proper clean  
							
							
							
						 
						
							2016-07-31 14:17:32 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								d5a947b324 
								
							 
						 
						
							
							
								
								Also depend on the gcc version  
							
							
							
						 
						
							2016-07-31 13:49:04 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								84bfb19554 
								
							 
						 
						
							
							
								
								Force compilation and linking when options changes  
							
							
							
						 
						
							2016-07-31 13:42:04 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								e58e9af2ab 
								
							 
						 
						
							
							
								
								More reliable .d file generation  
							
							... 
							
							
							
							Also generated inside the obj dir instead of separate deps folder. 
							
						 
						
							2016-07-31 13:36:30 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								f11a0275a8 
								
							 
						 
						
							
							
								
								Enable vpath seraching for source files only  
							
							
							
						 
						
							2016-07-31 13:24:25 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								bf1c865c7a 
								
							 
						 
						
							
							
								
								Speed up ChibiOS keymap compilation  
							
							... 
							
							
							
							By sharing the external library object files between the whole
keyboard, instead of re-compiling them for each keymap. 
							
						 
						
							2016-07-29 21:09:30 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								e01b4c3fd9 
								
							 
						 
						
							
							
								
								Most ergodox keymaps compiles on Infinity  
							
							... 
							
							
							
							There are linker errors due to missing led funcitonality though 
							
						 
						
							2016-07-29 20:48:20 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								16f8426fe2 
								
							 
						 
						
							
							
								
								Merge pull request  #573  from algernon/f/make-all-stop-on-error  
							
							... 
							
							
							
							tmk_core/rules.mk: Make PRINT_ERROR* stop on error 
							
						 
						
							2016-07-28 16:32:37 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gergely Nagy 
								
							 
						 
						
							
							
							
							
								
							
							
								dd77054790 
								
							 
						 
						
							
							
								
								tmk_core/rules.mk: Make PRINT_ERROR* stop on error  
							
							... 
							
							
							
							Instead of `&& false`, explicitly `exit 1` to make the rules using these macros
fail. This fixes  #571 , and likely breaks Travis badly.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
							
						 
						
							2016-07-27 08:53:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joe Wasson 
								
							 
						 
						
							
							
							
							
								
							
							
								f9956c2aac 
								
							 
						 
						
							
							
								
								Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.  
							
							
							
						 
						
							2016-07-24 12:56:28 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								fc9f128648 
								
							 
						 
						
							
							
								
								Merge pull request  #522  from exiva/extrakey-macfix  
							
							... 
							
							
							
							Fix OS X Recognizing keyboard as Mouse/Tablet 
							
						 
						
							2016-07-21 20:57:54 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Travis La Marr 
								
							 
						 
						
							
							
							
							
								
							
							
								d48a4cf1eb 
								
							 
						 
						
							
							
								
								Fix OS X Recognizing keyboard as Mouse/Tablet  
							
							... 
							
							
							
							Modified the LUFA USB HID Descriptor to change the logical/usage
minimums for System Control from 0x01 (Mouse) to 0x81 (System Power
Down), this fixes OS X recognizing the Planck as having a mouse and
tablet, even with mousekeys off. 
							
						 
						
							2016-07-15 10:41:32 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Travis La Marr 
								
							 
						 
						
							
							
							
							
								
							
							
								0b8c448b30 
								
							 
						 
						
							
							
								
								Make DFU wait for bootloader  
							
							... 
							
							
							
							Added a loop for waiting for the keyboard to be put in bootloader mode,
rather than failing out. Makes building keymaps easier. 
							
						 
						
							2016-07-15 10:28:23 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								6911ead027 
								
							 
						 
						
							
							
								
								Use order only prerequisites to avoid re-linking  
							
							... 
							
							
							
							The prerequisites at the start of the build process are order-only
so that the trget don't link again. Also added as a dependency to
the compilation to force the messages to be printed at the start 
							
						 
						
							2016-07-08 23:19:48 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								e8e300d5c4 
								
							 
						 
						
							
							
								
								Fix name of makefile dep files  
							
							... 
							
							
							
							The files can't start with a .dot, as the wildcard function wont
find them. So this is fixed by removing the BUILD_DIR from the
name. 
							
						 
						
							2016-07-08 22:59:09 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								1e3db59097 
								
							 
						 
						
							
							
								
								Fix the link target  
							
							
							
						 
						
							2016-07-08 18:18:33 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								ccebceeb6f 
								
							 
						 
						
							
							
								
								Don't run git describe for ever file that is built  
							
							
							
						 
						
							2016-07-08 17:44:41 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								b86b0480d5 
								
							 
						 
						
							
							
								
								Speed up compilation by not using recusive make  
							
							... 
							
							
							
							The cleaning is done outside the targets, by checking the
requested target name. 
							
						 
						
							2016-07-08 17:20:37 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								a2eae81927 
								
							 
						 
						
							
							
								
								Fix IS_CONSUMER macro  
							
							
							
						 
						
							2016-07-07 20:04:27 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								0bfb608615 
								
							 
						 
						
							
							
								
								Remove unhandled KC_BTLD, RESET should be used instead  
							
							
							
						 
						
							2016-07-07 19:56:55 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								ad43d450ca 
								
							 
						 
						
							
							
								
								Merge pull request  #490  from fredizzimo/integrate_visualizer  
							
							... 
							
							
							
							Integrate visualizer for ChibiOS and Infinity Ergodox 
							
						 
						
							2016-07-07 09:59:33 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								bcbd8f1c50 
								
							 
						 
						
							
							
								
								Add suspend support to the ChibiOS visualizer  
							
							
							
						 
						
							2016-07-07 14:22:45 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								7229751ba9 
								
							 
						 
						
							
							
								
								Fix visualizer crash at startup  
							
							... 
							
							
							
							Visualizer and serial link initialized in the wrong order.
The LED_ENABLED define wasn't set properly
uGfx is always initialized 
							
						 
						
							2016-07-07 14:01:20 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								07d0d5cbe4 
								
							 
						 
						
							
							
								
								Makefile fixes and update of Visualizer  
							
							
							
						 
						
							2016-07-07 12:46:10 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								a4bf46f9b1 
								
							 
						 
						
							
							
								
								default keymap, reset sorted out for now, added serial to makefile  
							
							
							
						 
						
							2016-07-06 22:48:19 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								c88207884b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into lets-split-support  
							
							
							
						 
						
							2016-07-06 18:05:50 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								e5726b017a 
								
							 
						 
						
							
							
								
								Add setting of the master side to the makefile  
							
							
							
						 
						
							2016-07-06 16:06:53 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								4b45deb652 
								
							 
						 
						
							
							
								
								Enable serial_link support for ChibiOS  
							
							
							
						 
						
							2016-07-06 16:06:53 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								22ad6459b1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into lets-split-support  
							
							
							
						 
						
							2016-07-05 23:40:58 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								d707738616 
								
							 
						 
						
							
							
								
								i2c working  
							
							
							
						 
						
							2016-07-05 23:27:10 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								f9a6e34c28 
								
							 
						 
						
							
							
								
								Add dfu-util command for programming  
							
							... 
							
							
							
							Also add .bin generation, which is needed for dfu-util. 
							
						 
						
							2016-07-05 19:28:17 +03:00