JeeBak Kim 
								
							 
						 
						
							
							
							
							
								
							
							
								f78a994355 
								
							 
						 
						
							
							
								
								Add "jeebak" keymap folder as a copy of the "default" folder  
							
							
							
						 
						
							2016-07-30 00:16:04 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								7775f3e4b3 
								
							 
						 
						
							
							
								
								Merge pull request  #589  from algernon/h/ergodox_ez-vs-ergodox  
							
							... 
							
							
							
							Update some obsolete references 
							
						 
						
							2016-07-30 02:53:29 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gergely Nagy 
								
							 
						 
						
							
							
							
							
								
							
							
								8a9bf1f165 
								
							 
						 
						
							
							
								
								Update some obsolete references  
							
							... 
							
							
							
							Some links were still pointing to `/keyboards/ergodox_ez`, while the
directory is `/keyboards/erdogox` now.
Not all references have been updated, and some of the text here and
there may need updating to mention the ErgoDox Infinity too, but that's
out of the scope for this quick fix.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
							
						 
						
							2016-07-30 08:37:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
							
							
								
							
							
								5f2d3f27de 
								
							 
						 
						
							
							
								
								Moved CapsLk, ScrollLk, and NumLk to Adjust layer  
							
							
							
						 
						
							2016-07-30 00:56:43 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								0b7557b60f 
								
							 
						 
						
							
							
								
								Merge pull request  #587  from fredizzimo/documentation_quick_fix  
							
							... 
							
							
							
							Fix the quick aliases documentation section 
							
						 
						
							2016-07-29 22:33:29 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								063983639d 
								
							 
						 
						
							
							
								
								Merge pull request  #503  from fredizzimo/ergodox_subproject  
							
							... 
							
							
							
							Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox 
							
						 
						
							2016-07-29 22:32:27 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								7d55951050 
								
							 
						 
						
							
							
								
								Fix the quick aliases documentation section  
							
							... 
							
							
							
							Also move all keyboard customization documentation under the
"Going Beyond the keycodes" heading. 
							
						 
						
							2016-07-29 22:47:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								566c79554e 
								
							 
						 
						
							
							
								
								Small fix for infinity include guard  
							
							
							
						 
						
							2016-07-29 21:09:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								6e8a5aca9d 
								
							 
						 
						
							
							
								
								Fix typo in the readme.  
							
							
							
						 
						
							2016-07-29 21:09:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								401dd09077 
								
							 
						 
						
							
							
								
								A couple of more Ergodox readme fixes  
							
							
							
						 
						
							2016-07-29 21:09:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								c65da1f208 
								
							 
						 
						
							
							
								
								Unify the ErgoDox EZ and Infinity documentation  
							
							
							
						 
						
							2016-07-29 21:09:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								44cefcb40a 
								
							 
						 
						
							
							
								
								Refer to the right path in the readme  
							
							
							
						 
						
							2016-07-29 21:09:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								349f189e83 
								
							 
						 
						
							
							
								
								Move Ergodox readme from ez subfolder to parent  
							
							
							
						 
						
							2016-07-29 21:09:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								ad416fb1a3 
								
							 
						 
						
							
							
								
								Include the main Makefile before including Ergodox infinity drivers  
							
							
							
						 
						
							2016-07-29 21:09:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								592ef7c6f0 
								
							 
						 
						
							
							
								
								Move Infinity Ergodox drivers to subproject, and fix makefile  
							
							
							
						 
						
							2016-07-29 21:09:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								37052a53f1 
								
							 
						 
						
							
							
								
								Remove the Infinity Ergodox default keymap  
							
							
							
						 
						
							2016-07-29 21:09:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								650298cec3 
								
							 
						 
						
							
							
								
								Cleanup the townk_osx config.h and make files  
							
							
							
						 
						
							2016-07-29 21:09:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								fd7f20b029 
								
							 
						 
						
							
							
								
								Rename supercoder config_user to config.h  
							
							... 
							
							
							
							Also fixup the include path of parent config 
							
						 
						
							2016-07-29 21:09:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								426e9ecc6f 
								
							 
						 
						
							
							
								
								Fix config.h include guards  
							
							
							
						 
						
							2016-07-29 21:09:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								a6577b272e 
								
							 
						 
						
							
							
								
								Define weak matrix user function for Infinity Ergodox  
							
							... 
							
							
							
							So that a few keyboards, which don't use them, links properly. 
							
						 
						
							2016-07-29 21:09:31 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								1641743b9d 
								
							 
						 
						
							
							
								
								Change _delay_ms to wait_ms in algernon keymap  
							
							
							
						 
						
							2016-07-29 21:09:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								e7670f6d19 
								
							 
						 
						
							
							
								
								Move some of the Ergodox config settings to shared  
							
							
							
						 
						
							2016-07-29 20:48:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								e0f28c2b10 
								
							 
						 
						
							
							
								
								Add empty led control functions to Infinity Ergodox  
							
							... 
							
							
							
							So that most keymaps compiles and links 
							
						 
						
							2016-07-29 20:48:21 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								b0376687f4 
								
							 
						 
						
							
							
								
								All Ez keymaps compiles  
							
							
							
						 
						
							2016-07-29 20:48:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								9af995c59b 
								
							 
						 
						
							
							
								
								Initial structure for Ergodox as subprojects  
							
							... 
							
							
							
							Only the EZ default keymaps compiles at the moment though. 
							
						 
						
							2016-07-29 20:48:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
							
							
								
							
							
								30003d48f9 
								
							 
						 
						
							
							
								
								Merge pull request  #584  from algernon/ergodox-ez/algernon  
							
							... 
							
							
							
							ergodox_ez: Upgrade my keymap to v1.4 
							
						 
						
							2016-07-29 08:11:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
							
							
								
							
							
								64e76f6ed3 
								
							 
						 
						
							
							
								
								Merge pull request  #583  from coderkun/coderkun_neo2  
							
							... 
							
							
							
							Ergodox EZ: update keymap “coderkun_neo2” 
							
						 
						
							2016-07-29 08:10:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
							
							
								
							
							
								3c235b4bf9 
								
							 
						 
						
							
							
								
								Merge pull request  #580  from MatsLanGoH/patch-1  
							
							... 
							
							
							
							Fixed a typo 
							
						 
						
							2016-07-29 08:09:05 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gergely Nagy 
								
							 
						 
						
							
							
							
							
								
							
							
								f82437f08e 
								
							 
						 
						
							
							
								
								ergodox_ez: Upgrade my keymap to v1.4  
							
							... 
							
							
							
							* When toggling the key logging on or off, the LEDs will do a little dance.
* The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it.
* The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key.
* The `-`/`_` key was turned into a tap-dance key too.
* There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
							
						 
						
							2016-07-29 12:24:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
							
							
								
							
							
								3ace37271b 
								
							 
						 
						
							
							
								
								disable sleep LED  
							
							
							
						 
						
							2016-07-29 11:28:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
							
							
								
							
							
								70755d6614 
								
							 
						 
						
							
							
								
								complete labels for modifiers in keymap schema  
							
							
							
						 
						
							2016-07-29 11:07:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
							
							
								
							
							
								08239aadea 
								
							 
						 
						
							
							
								
								use Ergodox EZ’s third LED for “scroll lock”  
							
							
							
						 
						
							2016-07-29 11:07:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
							
							
								
							
							
								61fbb47eb6 
								
							 
						 
						
							
							
								
								fix grave (GRV) and acute (ACUT) accents  
							
							
							
						 
						
							2016-07-29 11:06:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
							
							
								
							
							
								c018743729 
								
							 
						 
						
							
							
								
								Connected all layers through Adjust layer  
							
							
							
						 
						
							2016-07-29 00:08:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthias 
								
							 
						 
						
							
							
							
							
								
							
							
								e8f7038959 
								
							 
						 
						
							
							
								
								Fixed a typo  
							
							... 
							
							
							
							Fixed a typo in line 738 'void martix_init' to 'void matrix_init' 
							
						 
						
							2016-07-29 10:02:59 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								7559edc6e6 
								
							 
						 
						
							
							
								
								Merge pull request  #578  from 0xdec/master  
							
							... 
							
							
							
							0xdec Preonic keymap 
							
						 
						
							2016-07-28 16:34:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								9b5edbdce9 
								
							 
						 
						
							
							
								
								Merge pull request  #577  from hot-leaf-juice/master  
							
							... 
							
							
							
							Pull request to include my keymap if you want it! 
							
						 
						
							2016-07-28 16:34:16 -04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordi Orlando 
								
							 
						 
						
							
							
							
							
								
							
							
								3b39910cb9 
								
							 
						 
						
							
							
								
								Create 0xdec Preonic keymap  
							
							... 
							
							
							
							An ergonomically optimized Colemak keymap for the grid-layout Preonic 
							
						 
						
							2016-07-28 14:36:20 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
							
							
								
							
							
								6567fa1ebe 
								
							 
						 
						
							
							
								
								Fixed Function keys (Impossible layout)  
							
							
							
						 
						
							2016-07-28 14:57:45 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Christie 
								
							 
						 
						
							
							
							
							
								
							
							
								a4e5a4d566 
								
							 
						 
						
							
							
								
								Modified Qwerty, created Qwerty with numbers  
							
							
							
						 
						
							2016-07-28 13:49:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Browne 
								
							 
						 
						
							
							
							
							
								
							
							
								2d59c97ec1 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
						 
						
							2016-07-28 12:42:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								80667e898a 
								
							 
						 
						
							
							
								
								Merge pull request  #572  from algernon/f/tap-dance-debug  
							
							... 
							
							
							
							tap-dance: Add some debugging support 
							
						 
						
							2016-07-28 12:28:30 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								e5ac0e8369 
								
							 
						 
						
							
							
								
								Merge pull request  #570  from sethbc/fix_bone2planck_build  
							
							... 
							
							
							
							Fix bone2planck build 
							
						 
						
							2016-07-28 12:27:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								a6d279a343 
								
							 
						 
						
							
							
								
								Merge pull request  #569  from sethbc/fix_stanleylai_warnings  
							
							... 
							
							
							
							kill warnings filling up travis buildlog 
							
						 
						
							2016-07-28 12:27:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								36df9fd3fd 
								
							 
						 
						
							
							
								
								Merge pull request  #568  from sethbc/fix-colemak-osx-pc-no  
							
							... 
							
							
							
							update NO_AMP to NO_AMPR 
							
						 
						
							2016-07-28 12:26:43 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								f96a2a74ea 
								
							 
						 
						
							
							
								
								Merge pull request  #566  from SmackleFunky/master  
							
							... 
							
							
							
							Allow toggling out of plover layer 
							
						 
						
							2016-07-28 12:26:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								9171ce1d17 
								
							 
						 
						
							
							
								
								Merge pull request  #559  from Talljoe/fix-compiler-warning  
							
							... 
							
							
							
							Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. 
							
						 
						
							2016-07-28 12:24:42 -04:00