tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								363950982a 
								
							 
						 
						
							
							
								
								Merge branch 'rn42' into merge_rn42  
							
							... 
							
							
							
							Conflicts:
	.gitignore
	common.mk
	common/debug_config.h
	common/print.h 
							
						 
						
							2014-11-24 13:50:33 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								821c719e98 
								
							 
						 
						
							
							
								
								Add action 'Momentary switching with Modifiers'  
							
							
							
						 
						
							2014-09-29 10:29:33 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								c67ae2a6b5 
								
							 
						 
						
							
							
								
								Port action_* to mbed  
							
							
							
						 
						
							2014-07-30 14:07:43 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ralf Schmitt 
								
							 
						 
						
							
							
							
							
								
							
							
								589d99b448 
								
							 
						 
						
							
							
								
								New macro: ACTION_BACKLIGHT_LEVEL(level)  
							
							... 
							
							
							
							To have full control of the backlight level. 
							
						 
						
							2014-04-08 21:02:46 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								fd9ee507a5 
								
							 
						 
						
							
							
								
								Merge branch 'modstaptoggle' of git://github.com/simonmelhart/tmk_keyboard into simonmelhart-modstaptoggle  
							
							... 
							
							
							
							Conflicts:
	common/action_code.h 
							
						 
						
							2013-11-28 16:31:06 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Simon Melhart 
								
							 
						 
						
							
							
							
							
								
							
							
								a6afa845b9 
								
							 
						 
						
							
							
								
								Add tap toggle modifiers  
							
							... 
							
							
							
							Including documentation. 
							
						 
						
							2013-11-20 09:21:33 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								d7f663a1ea 
								
							 
						 
						
							
							
								
								Fix to build ps2_mouse with both LUFA and PJRC  
							
							... 
							
							
							
							- change API of ps2_mouse; ps2_mouse_task()
- remove mouse_report from host.c 
							
						 
						
							2013-11-20 11:32:09 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								35f9f30074 
								
							 
						 
						
							
							
								
								Add timeout option to MODS_ONESHOT  #66  
							
							
							
						 
						
							2013-10-07 23:28:17 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								d52d554360 
								
							 
						 
						
							
							
								
								Fix mod stuck of MODS_KEY when leaving layer  #62  
							
							... 
							
							
							
							- Add action_util.c and remove action_oneshot.c
- Add oneshot_mods for MODS_ONESHOT
- Add weak_mods for MODS_KEY and MACRO
- weak_mods is cleared when layer switching 
							
						 
						
							2013-10-04 16:04:31 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								2721022078 
								
							 
						 
						
							
							
								
								Add mechanical locking switch support for NumLock and ScrollLock  
							
							
							
						 
						
							2013-07-23 10:56:03 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								6aaa6e0ef9 
								
							 
						 
						
							
							
								
								Add support for macro media/system keys  
							
							
							
						 
						
							2013-07-23 07:53:18 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								f8fbecff4d 
								
							 
						 
						
							
							
								
								Change name ACT_LAYER_TAP1 to ACT_LAYER_TAP_EXT  
							
							
							
						 
						
							2013-07-20 03:27:36 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Wraul 
								
							 
						 
						
							
							
							
							
								
							
							
								1eb8523e95 
								
							 
						 
						
							
							
								
								Add support for backlight  
							
							
							
						 
						
							2013-06-22 17:23:36 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								ff2d276b19 
								
							 
						 
						
							
							
								
								Use dprint and dprintf for debug  
							
							
							
						 
						
							2013-05-14 16:19:40 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								f9a7e224a4 
								
							 
						 
						
							
							
								
								Fix ACT_MODS action and switch_default_layer command  
							
							
							
						 
						
							2013-04-04 16:29:44 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								c6d88d2795 
								
							 
						 
						
							
							
								
								Rename file layer_switch to action_layer  
							
							
							
						 
						
							2013-04-02 17:44:24 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								cc8e66754b 
								
							 
						 
						
							
							
								
								Refine ACT_LAYER and ACT_LAYER_TAP  
							
							... 
							
							
							
							- Remove ACT_LAYER_BITOP 
							
						 
						
							2013-04-02 16:09:43 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								10f33a3e48 
								
							 
						 
						
							
							
								
								Remove ACT_KEYMAP and ACT_OVERLAY  
							
							... 
							
							
							
							- Remove ACT_OVERLAY
- Rename ACT_KEYMAP to ACT_LAYER
- Add ACT_LAYER_BITOP 
							
						 
						
							2013-03-31 22:47:19 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								c69f7e1069 
								
							 
						 
						
							
							
								
								Add action_tapping.[ch] for refactoring  
							
							
							
						 
						
							2013-03-29 02:46:05 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								74aea627e7 
								
							 
						 
						
							
							
								
								Clean action.c  
							
							
							
						 
						
							2013-03-21 15:24:48 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								d44290b91b 
								
							 
						 
						
							
							
								
								Add NO_ACTION_ONESHOT config option  
							
							
							
						 
						
							2013-03-21 14:42:40 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								dbcac865b9 
								
							 
						 
						
							
							
								
								Add NO_ACTION_KEYMAP config option  
							
							
							
						 
						
							2013-03-20 01:45:04 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								ecb7550a91 
								
							 
						 
						
							
							
								
								Add NO_ACTION_FUNCTION config option  
							
							
							
						 
						
							2013-03-20 00:37:32 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								9757f960f9 
								
							 
						 
						
							
							
								
								Add NO_ACTION_TAPPING and NO_ACTION_MACRO config options  
							
							
							
						 
						
							2013-03-20 00:28:13 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								b057511f45 
								
							 
						 
						
							
							
								
								Add NO_ACTION_OVERLAY config option  
							
							
							
						 
						
							2013-03-20 00:26:01 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								92b92dd78f 
								
							 
						 
						
							
							
								
								Add mechanical locking switch support for CapsLock  
							
							
							
						 
						
							2013-03-12 10:43:02 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								1aa067e541 
								
							 
						 
						
							
							
								
								Clean action.h and add keymap doc  
							
							
							
						 
						
							2013-03-05 02:42:28 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								40f1a4930a 
								
							 
						 
						
							
							
								
								Fix SET_DEFAULT_LAYER action and keymap of gh60  
							
							
							
						 
						
							2013-02-27 10:32:46 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								a207e848b3 
								
							 
						 
						
							
							
								
								Add tap flags on record_t  
							
							
							
						 
						
							2013-02-26 16:27:09 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								23c32d304b 
								
							 
						 
						
							
							
								
								Add MACRO action  
							
							
							
						 
						
							2013-02-25 15:30:37 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								59e073e82b 
								
							 
						 
						
							
							
								
								Fix tap key bug: layer stuck  
							
							... 
							
							
							
							- Can't use Invert action for tap key, use On/Off insted. 
							
						 
						
							2013-02-20 16:53:55 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								c3d57b69e0 
								
							 
						 
						
							
							
								
								Add keymap clear/reset action  
							
							
							
						 
						
							2013-02-20 15:52:32 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								e0f960a576 
								
							 
						 
						
							
							
								
								Add overlay framework  
							
							
							
						 
						
							2013-02-20 11:48:15 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								e324fa2918 
								
							 
						 
						
							
							
								
								Rewrite layer action with layer_switch  
							
							
							
						 
						
							2013-02-16 04:08:31 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								d9f2875866 
								
							 
						 
						
							
							
								
								Replace layer_stack with layer_switch  
							
							
							
						 
						
							2013-02-15 18:48:36 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								768ea72f10 
								
							 
						 
						
							
							
								
								Add layer_stack files taking apart from action.c  
							
							
							
						 
						
							2013-02-15 13:47:41 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								a4aae1c505 
								
							 
						 
						
							
							
								
								Change: 0 means default_layer in current_layer now  
							
							... 
							
							
							
							- current_layer indicates active layer at the time
- default_layer indicates base layer
- default_layer is used when current_layer is 0
- with this LAYER_BIT action works as overlay even if
  default_layer varies other than layer 0. 
							
						 
						
							2013-02-15 12:31:46 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								0018e19f07 
								
							 
						 
						
							
							
								
								Add layer stack  
							
							
							
						 
						
							2013-02-14 15:22:59 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								c4421f585b 
								
							 
						 
						
							
							
								
								Change struct key_t  
							
							
							
						 
						
							2013-02-13 12:16:24 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								9bc82bf61c 
								
							 
						 
						
							
							
								
								Change action API  
							
							
							
						 
						
							2013-02-13 11:47:19 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								48e6d0848c 
								
							 
						 
						
							
							
								
								Make Transparent feature available to new keymaps.  
							
							
							
						 
						
							2013-02-13 09:26:22 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								77af88042a 
								
							 
						 
						
							
							
								
								Change ACTION_LAYER_SET_LAYER behaviour  
							
							
							
						 
						
							2013-02-12 17:12:04 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								eea85c7e24 
								
							 
						 
						
							
							
								
								Fix is_tap_key()  
							
							
							
						 
						
							2013-02-11 00:02:11 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								b2aa142ee0 
								
							 
						 
						
							
							
								
								Clean layer actions.  
							
							
							
						 
						
							2013-02-10 16:11:07 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								aad91a30a3 
								
							 
						 
						
							
							
								
								Add macro feature.  
							
							
							
						 
						
							2013-02-04 22:53:45 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								1d7962ba8a 
								
							 
						 
						
							
							
								
								Add user defined function to action.  
							
							
							
						 
						
							2013-02-01 14:48:11 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								d95463f2e0 
								
							 
						 
						
							
							
								
								Add legacy keymap support.  
							
							
							
						 
						
							2013-01-31 17:50:53 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								e760953910 
								
							 
						 
						
							
							
								
								Fix tapping. tap key just after tap timeout.  
							
							
							
						 
						
							2013-01-31 15:07:01 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								7e1093b70f 
								
							 
						 
						
							
							
								
								Fix: action LAYER_BIT uses xor now instead of and/or.  
							
							
							
						 
						
							2013-01-30 22:47:16 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tmk 
								
							 
						 
						
							
							
							
							
								
							
							
								10b9237fa6 
								
							 
						 
						
							
							
								
								Fix process_tapping().  
							
							
							
						 
						
							2013-01-30 21:18:03 +09:00