Wojciech Siewierski 
							
						 
					 
					
						
						
						
						
							
						
						
							4dce7258d1 
							
						 
					 
					
						
						
							
							Cleanup after merge  
						
						... 
						
						
						
						- remove a superfluous parenthesis
- wrap lines longer than 80 characters
- add const specifiers where appropriate
- remove unnecessary casts 
						
						
					 
					
						2016-04-02 19:29:01 +02:00 
						 
				 
			
				
					
						
							
							
								eltang 
							
						 
					 
					
						
						
						
						
							
						
						
							5a9091689c 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-02 10:00:31 -07:00 
						 
				 
			
				
					
						
							
							
								eltang 
							
						 
					 
					
						
						
						
						
							
						
						
							6c8e374d57 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-02 09:59:53 -07:00 
						 
				 
			
				
					
						
							
							
								eltang 
							
						 
					 
					
						
						
						
						
							
						
						
							f4f592910c 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-02 09:34:01 -07:00 
						 
				 
			
				
					
						
							
							
								eltang 
							
						 
					 
					
						
						
						
						
							
						
						
							da101b8866 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-02 09:29:32 -07:00 
						 
				 
			
				
					
						
							
							
								eltang 
							
						 
					 
					
						
						
						
						
							
						
						
							fddccc95fe 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-02 09:13:13 -07:00 
						 
				 
			
				
					
						
							
							
								eltang 
							
						 
					 
					
						
						
						
						
							
						
						
							680301e3e3 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-02 06:48:44 -07:00 
						 
				 
			
				
					
						
							
							
								Eric-L-T 
							
						 
					 
					
						
						
						
						
							
						
						
							f5365d1c1c 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-01 20:04:13 -07:00 
						 
				 
			
				
					
						
							
							
								Eric-L-T 
							
						 
					 
					
						
						
						
						
							
						
						
							307f1dee21 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-01 19:54:02 -07:00 
						 
				 
			
				
					
						
							
							
								Eric-L-T 
							
						 
					 
					
						
						
						
						
							
						
						
							420fc8620b 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-01 18:26:43 -07:00 
						 
				 
			
				
					
						
							
							
								Eric-L-T 
							
						 
					 
					
						
						
						
						
							
						
						
							9a35f01c55 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-01 13:49:03 -07:00 
						 
				 
			
				
					
						
							
							
								Eric-L-T 
							
						 
					 
					
						
						
						
						
							
						
						
							cd8dd1b6d6 
							
						 
					 
					
						
						
							
							Update action.h  
						
						
						
						
					 
					
						2016-04-01 13:45:01 -07:00 
						 
				 
			
				
					
						
							
							
								Eric-L-T 
							
						 
					 
					
						
						
						
						
							
						
						
							317455178d 
							
						 
					 
					
						
						
							
							Update action.c  
						
						
						
						
					 
					
						2016-04-01 13:43:49 -07:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							8bbc1dcf4f 
							
						 
					 
					
						
						
							
							Merge pull request  #219  from IBNobody/master  
						
						... 
						
						
						
						Master 
						
						
					 
					
						2016-03-28 23:17:16 -04:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							1d13aa933b 
							
						 
					 
					
						
						
							
							Minor Tweaks and Documentation  
						
						... 
						
						
						
						Fixed compiler warning by including bootloader.h in keymap_common.c.
Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined.
Added extra documentation to the template config.h 
						
						
					 
					
						2016-03-28 19:45:20 -05:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							a70f439672 
							
						 
					 
					
						
						
							
							Added command to turn LED indicators off while sleeping  
						
						
						
						
					 
					
						2016-03-28 16:21:09 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							fd9e5d1510 
							
						 
					 
					
						
						
							
							Merge pull request  #214  from cdlm/action-hook  
						
						... 
						
						
						
						Add per-event user hook function 
						
						
					 
					
						2016-03-28 11:55:19 -04:00 
						 
				 
			
				
					
						
							
							
								Damien Pollet 
							
						 
					 
					
						
						
						
						
							
						
						
							acd64aa841 
							
						 
					 
					
						
						
							
							Rename function to be keyboard-specific  
						
						
						
						
					 
					
						2016-03-28 16:30:00 +02:00 
						 
				 
			
				
					
						
							
							
								Damien Pollet 
							
						 
					 
					
						
						
						
						
							
						
						
							ef21a855e6 
							
						 
					 
					
						
						
							
							Add per-event user hook function to QMK  
						
						
						
						
					 
					
						2016-03-28 16:30:00 +02:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							577971ab07 
							
						 
					 
					
						
						
							
							Magic Key Overrides / Keyboard Lock / Forced NKRO  
						
						... 
						
						
						
						Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock
option to template / Added forced NKRO option to template (disabled by
default) 
						
						
					 
					
						2016-03-28 00:03:21 -05:00 
						 
				 
			
				
					
						
							
							
								Wojciech Siewierski 
							
						 
					 
					
						
						
						
						
							
						
						
							b4f442dfea 
							
						 
					 
					
						
						
							
							Cut the memory consumption of PREVENT_STUCK_MODIFIERS in half  
						
						
						
						
					 
					
						2016-03-27 23:51:46 +02:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							80eefb09ac 
							
						 
					 
					
						
						
							
							Merge pull request  #188  from DidierLoiseau/issue-156  
						
						... 
						
						
						
						Fix  #156 : clear weak mods on every key press 
					
						2016-03-27 21:09:15 +03:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							10491ba21f 
							
						 
					 
					
						
						
							
							Fixed LED Function Calls  
						
						... 
						
						
						
						Fixed LED indicator function calls to match how the matrix init function
calls are formatted. 
						
						
					 
					
						2016-03-22 20:58:44 -05:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							ec62d9e85c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/jackhumbert/master'  
						
						... 
						
						
						
						# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h 
						
						
					 
					
						2016-03-22 20:39:05 -05:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							eba9a7d74d 
							
						 
					 
					
						
						
							
							Adding LED function pointers  
						
						
						
						
					 
					
						2016-03-15 23:52:51 -05:00 
						 
				 
			
				
					
						
							
							
								Wojciech Siewierski 
							
						 
					 
					
						
						
						
						
							
						
						
							a5cdc3aab1 
							
						 
					 
					
						
						
							
							Expose the pressed_actions_cache global variable  
						
						
						
						
					 
					
						2016-03-15 16:51:50 +01:00 
						 
				 
			
				
					
						
							
							
								Wojciech Siewierski 
							
						 
					 
					
						
						
						
						
							
						
						
							73cb87740b 
							
						 
					 
					
						
						
							
							Always provide an implementation of process_action_nocache  
						
						
						
						
					 
					
						2016-03-15 16:03:30 +01:00 
						 
				 
			
				
					
						
							
							
								Wojciech Siewierski 
							
						 
					 
					
						
						
						
						
							
						
						
							20dd9c0326 
							
						 
					 
					
						
						
							
							process_action may be called either with key cache or without it  
						
						... 
						
						
						
						If one wants to temporarily disable the key cache (for example because
it interferes with a macro), `disable_action_cache` must be set to
`true`. `process_action_nocache` is a simple wrapper doing just that for
a single call. 
						
						
					 
					
						2016-03-13 00:18:20 +01:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							641859df84 
							
						 
					 
					
						
						
							
							Addressed void* return warning in all keymaps  
						
						
						
						
					 
					
						2016-03-10 11:28:34 -05:00 
						 
				 
			
				
					
						
							
							
								Didier Loiseau 
							
						 
					 
					
						
						
						
						
							
						
						
							b7a81f0419 
							
						 
					 
					
						
						
							
							Fix   #156 : clear weak mods on every key press  
						
						... 
						
						
						
						- new macro_mods bit field for mods applied by macros
- weak_mods now only used for ACT_{L,R}MODS (i.e. LSFT, RSFT, LCTL etc.)
- clear the _weak_ mods on every key *pressed* such that LSFT etc.
  can no more interfere with the next key 
						
						
					 
					
						2016-03-08 23:14:15 +01:00 
						 
				 
			
				
					
						
							
							
								Wojciech Siewierski 
							
						 
					 
					
						
						
						
						
							
						
						
							8d55a12a95 
							
						 
					 
					
						
						
							
							Document the issue of stuck modifiers  
						
						
						
						
					 
					
						2016-03-08 08:48:43 +01:00 
						 
				 
			
				
					
						
							
							
								Wojciech Siewierski 
							
						 
					 
					
						
						
						
						
							
						
						
							c2480884aa 
							
						 
					 
					
						
						
							
							Fix the layer-dependent modifiers handling  
						
						... 
						
						
						
						Closes  #181 . 
					
						2016-03-05 14:42:17 +01:00 
						 
				 
			
				
					
						
							
							
								dragon788 
							
						 
					 
					
						
						
						
						
							
						
						
							34a8ad506c 
							
						 
					 
					
						
						
							
							Added note about using avr_setup.sh  
						
						... 
						
						
						
						On most Linux distributions the avr_setup.sh script can be sourced ```. avr_setup.sh``` or under Bash ```source avr_setup.sh```. This will try and detect the appropriate package manager and install the required packages. 
						
						
					 
					
						2016-02-07 17:16:28 -06:00 
						 
				 
			
				
					
						
							
							
								Peter Eichinger 
							
						 
					 
					
						
						
						
						
							
						
						
							78192791bc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into flicker-fix  
						
						
						
						
					 
					
						2016-01-25 17:46:50 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Eichinger 
							
						 
					 
					
						
						
						
						
							
						
						
							c5f90eb99b 
							
						 
					 
					
						
						
							
							Remove led_off() it is not used  
						
						
						
						
					 
					
						2016-01-24 11:13:11 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							c753bfcc14 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/tmk_keyboard  into audio  
						
						
						
						
					 
					
						2016-01-23 20:32:51 -05:00 
						 
				 
			
				
					
						
							
							
								Peter Eichinger 
							
						 
					 
					
						
						
						
						
							
						
						
							b2badef7d0 
							
						 
					 
					
						
						
							
							Backlight fix from reddit  
						
						... 
						
						
						
						https://www.reddit.com/r/olkb/comments/41ur41/crazy_flashing_when_my_computer_sleeps/  
					
						2016-01-22 17:37:22 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							eb61700912 
							
						 
					 
					
						
						
							
							better integrations  
						
						
						
						
					 
					
						2016-01-20 00:06:52 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							0f867796de 
							
						 
					 
					
						
						
							
							timer 3  
						
						
						
						
					 
					
						2016-01-11 17:52:35 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							29de37d5c0 
							
						 
					 
					
						
						
							
							pwm audio  
						
						
						
						
					 
					
						2016-01-11 16:53:33 -05:00 
						 
				 
			
				
					
						
							
							
								dragon788 
							
						 
					 
					
						
						
						
						
							
						
						
							c760a273fb 
							
						 
					 
					
						
						
							
							Added note about avr-libc also being required at least for arch  
						
						
						
						
					 
					
						2015-12-30 23:22:29 -06:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							f024a462cd 
							
						 
					 
					
						
						
							
							Fixes rolling combos for mod-tap keys  
						
						
						
						
					 
					
						2015-10-28 04:19:13 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							547da78335 
							
						 
					 
					
						
						
							
							merging tmk  
						
						
						
						
					 
					
						2015-10-27 12:42:30 -04:00 
						 
				 
			
				
					
						
							
							
								Jun Wako 
							
						 
					 
					
						
						
						
						
							
						
						
							5ce9bf8353 
							
						 
					 
					
						
						
							
							Merge commit 'fdc38ef3f92af7adeeb4de49550d8838c8a39b5c'  
						
						
						
						
					 
					
						2015-09-24 12:29:11 +09:00 
						 
				 
			
				
					
						
							
							
								Jun Wako 
							
						 
					 
					
						
						
						
						
							
						
						
							77afc5a76f 
							
						 
					 
					
						
						
							
							core: Fix NKRO ifdef  
						
						
						
						
					 
					
						2015-09-24 01:35:10 +09:00 
						 
				 
			
				
					
						
							
							
								tmk 
							
						 
					 
					
						
						
						
						
							
						
						
							ed9766a7d4 
							
						 
					 
					
						
						
							
							core: Fix for disabling NKRO in Boot protocol  
						
						
						
						
					 
					
						2015-09-20 14:34:13 +09:00 
						 
				 
			
				
					
						
							
							
								tmk 
							
						 
					 
					
						
						
						
						
							
						
						
							e8a4a63ec4 
							
						 
					 
					
						
						
							
							core: Fix message print of debug command  
						
						
						
						
					 
					
						2015-09-20 10:51:30 +09:00 
						 
				 
			
				
					
						
							
							
								tmk 
							
						 
					 
					
						
						
						
						
							
						
						
							bf3d4b3c06 
							
						 
					 
					
						
						
							
							lufa: Fix endpoint bank mode for ATMega32u2  
						
						
						
						
					 
					
						2015-09-20 10:48:47 +09:00 
						 
				 
			
				
					
						
							
							
								tmk 
							
						 
					 
					
						
						
						
						
							
						
						
							9b99f8f864 
							
						 
					 
					
						
						
							
							next_usb: Fix next_kbd_set_leds()  
						
						
						
						
					 
					
						2015-09-20 10:33:25 +09:00 
						 
				 
			
				
					
						
							
							
								tmk 
							
						 
					 
					
						
						
						
						
							
						
						
							498654fc4c 
							
						 
					 
					
						
						
							
							Change to KC_BOOTLOADER(KC_BTLD)  
						
						
						
						
					 
					
						2015-09-16 13:01:06 +09:00