1
0
Commit Graph

592 Commits

Author SHA1 Message Date
Kai Ryu
74397b510e Improve behavior of suspend
- Add suspend action for user defined suspend behavior
- Disable softpwm led when suspending
2015-01-09 11:45:27 +09:00
Kai Ryu
9794deaada Add more build options to version info of magic command 2014-12-10 11:05:47 +09:00
Kai Ryu
f2750caad9 Fix 6KRO compatibility issue with NKRO 2014-12-10 10:21:58 +09:00
Kai Ryu
1ac468aa5d Improve ledmap feature
- Change date type of ledmap from byte to word
- New reverse bit, reversing binding stats
- Fix minor bugs
2014-11-25 18:23:16 +09:00
Kai Ryu
4cf7e9fd7b Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	common.mk
	common/action_util.c
2014-11-25 11:06:28 +09:00
tmk
a37e6270c1 Merge branch 'merge_rn42' 2014-11-24 15:36:53 +09:00
tmk
01b175b134 Fix debug.h 2014-11-24 14:33:50 +09:00
tmk
b748f8575a 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
16e40e658f Remove MCU dependent code from common/keyboard.c 2014-11-23 13:38:10 +09:00
tmk
5ed714f3eb Matrix power saving 2014-11-23 13:08:05 +09:00
tmk
59fc299e15 USB initialize when plug-in during battery powered 2014-11-20 17:24:56 +09:00
tmk
2bab365758 Merge branch 'action_fix' 2014-11-18 04:10:48 +09:00
tmk
7a318f1e98 Add initializer of debug_config for GCC < 4.6.0(#144) 2014-11-14 22:53:25 +09:00
tmk
cc6806d573 Fix for 'unnamed field in initializer' GCC bug(Fix #143) 2014-11-14 17:49:48 +09:00
Simon Stapleton
adb178df5d ignore files with trailing ~ 2014-11-14 17:25:49 +09:00
tmk
e0ebfcaa8d Merge pull request #142 from 0mark/master
fixed vusb variant of converter ps2usb
2014-11-14 04:56:00 +09:00
Stefan Mark
c4607a3154 fixed vusb variant of converter ps2usb 2014-11-13 12:07:56 +01:00
tmk
b28f8bd637 Add action 'Momentary switching with Modifiers' 2014-09-29 10:29:33 +09:00
tmk
11206ca42f Fix typo of variable name 2014-09-24 15:52:31 +09:00
Kai Ryu
d9a1d5786e Merge branch 'redscarfII' 2014-09-22 18:33:21 +09:00
Kai Ryu
dbc7693581 Merge branch '6kro' 2014-09-22 18:33:09 +09:00
Kai Ryu
9776166cd8 Fix compatibility problem with NKRO 2014-09-22 18:31:18 +09:00
tmk
76447aad89 Merge branch 'usb_usb_fix' 2014-09-22 10:53:35 +09:00
tmk
5b34bfed83 Merge branch 'scottjad-master' into usb_usb_fix 2014-09-22 10:52:27 +09:00
tmk
7ab4f120ee Adhoc fix compile error of usb_usb 2014-09-22 10:42:20 +09:00
tmk
9772e2cc56 Merge branch 'rhaberkorn-serial-mouse' 2014-08-26 17:48:34 +09:00
tmk
39804c7e99 Add option 7bit data to serial_soft.c 2014-08-26 17:39:04 +09:00
tmk
8b78232f9d Add serial_mouse_task in keyboard.c 2014-08-26 17:36:44 +09:00
tmk
289c47fce0 Revert lufa/lufa.c 2014-08-26 17:35:16 +09:00
tmk
86a6e6e5fd Merge branch 'serial-mouse' of git://github.com/rhaberkorn/tmk_keyboard into rhaberkorn-serial-mouse 2014-08-26 05:02:37 +09:00
Kai Ryu
7e2ab6c1b3 Add build option FADING_LED_ENABLE 2014-08-25 16:29:09 +09:00
Kai Ryu
844b64ff19 Change implement from breathing led to fading led 2014-08-25 14:03:23 +09:00
Kai Ryu
fcaefce76f A typing led feature 2014-08-22 19:18:12 +09:00
Kai Ryu
f179c9a04a Add init callback function to softpwm_led 2014-08-03 12:00:18 +09:00
Kai Ryu
fbbcf3ce0c Change backlight_level to backlight_xor 2014-08-03 11:36:41 +09:00
Kai Ryu
22273c5edf Merge branch 'ledmap' 2014-08-03 11:33:02 +09:00
Kai Ryu
9c61e8e4f6 Change ledmap code definition 2014-08-03 11:27:54 +09:00
Kai Ryu
44651f4192 Improve softpwm to control LED respectively 2014-08-02 10:15:57 +09:00
tmk
6804a4516e Add flow control by firmware to serial_uart 2014-07-30 14:38:26 +09:00
tmk
2206a6d67a Mkdir rn42 2014-07-30 14:38:26 +09:00
tmk
77776156fb Change buffer size: 256 bytes 2014-07-30 14:38:26 +09:00
tmk
068778e2b3 Ad hoc fix of command API 2014-07-30 14:38:25 +09:00
tmk
8997817a4e Fix timer.h to include AVR specific header 2014-07-30 14:38:25 +09:00
tmk
3eb040daa9 Merge branch 'mbed' into dev 2014-07-30 14:37:05 +09:00
tmk
bc8328e01d Add checksum tool for NXP LPC 2014-07-30 14:07:43 +09:00
tmk
54bb39d592 Add LED indicator support in mbed 2014-07-30 14:07:43 +09:00
tmk
daf232794e Port ps2_usb to mbed 2014-07-30 14:07:43 +09:00
tmk
1b23028a38 Fix build files for mbed 2014-07-30 14:07:43 +09:00
tmk
412ca57be1 Fix common files for mbed 2014-07-30 14:07:43 +09:00
tmk
cb45c69d25 Fix debug.h and remove debug_config.h 2014-07-30 14:07:43 +09:00