1
0
Commit Graph

250 Commits

Author SHA1 Message Date
Kai Ryu
0b5b76d8a7 Add more build options to version info of magic command 2014-12-10 11:05:47 +09:00
Kai Ryu
e36e2493ba Fix 6KRO compatibility issue with NKRO 2014-12-10 10:21:58 +09:00
Kai Ryu
f6643a082c 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
15d9c0a692 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	common.mk
	common/action_util.c
2014-11-25 11:06:28 +09:00
tmk
a996396045 Fix debug.h 2014-11-24 14:33:50 +09:00
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
1f96edaed6 Remove MCU dependent code from common/keyboard.c 2014-11-23 13:38:10 +09:00
tmk
608ebe2686 Matrix power saving 2014-11-23 13:08:05 +09:00
tmk
c2d830c07c USB initialize when plug-in during battery powered 2014-11-20 17:24:56 +09:00
tmk
1961641463 Merge branch 'action_fix' 2014-11-18 04:10:48 +09:00
tmk
a58b9ddbd5 Add initializer of debug_config for GCC < 4.6.0(#144) 2014-11-14 22:53:25 +09:00
tmk
8180709132 Fix for 'unnamed field in initializer' GCC bug(Fix #143) 2014-11-14 17:49:48 +09:00
tmk
821c719e98 Add action 'Momentary switching with Modifiers' 2014-09-29 10:29:33 +09:00
Kai Ryu
fb105cd339 Merge branch '6kro' 2014-09-22 18:33:09 +09:00
Kai Ryu
a8ef66987d Fix compatibility problem with NKRO 2014-09-22 18:31:18 +09:00
tmk
ea524d7bef Adhoc fix compile error of usb_usb 2014-09-22 10:42:20 +09:00
tmk
c4530ab0a8 Add serial_mouse_task in keyboard.c 2014-08-26 17:36:44 +09:00
Kai Ryu
5ea92acdf7 Change implement from breathing led to fading led 2014-08-25 14:03:23 +09:00
Kai Ryu
7a3652f6fa A typing led feature 2014-08-22 19:18:12 +09:00
Kai Ryu
78242ebba1 Add init callback function to softpwm_led 2014-08-03 12:00:18 +09:00
Kai Ryu
89bdc9fb72 Change backlight_level to backlight_xor 2014-08-03 11:36:41 +09:00
Kai Ryu
8b070f0f54 Merge branch 'ledmap' 2014-08-03 11:33:02 +09:00
Kai Ryu
ea40fc4eb1 Change ledmap code definition 2014-08-03 11:27:54 +09:00
Kai Ryu
49e70286a6 Improve softpwm to control LED respectively 2014-08-02 10:15:57 +09:00
tmk
47bc3016d3 Ad hoc fix of command API 2014-07-30 14:38:25 +09:00
tmk
54aee16a84 Fix timer.h to include AVR specific header 2014-07-30 14:38:25 +09:00
tmk
4c8e0fd0bd Port ps2_usb to mbed 2014-07-30 14:07:43 +09:00
tmk
e81c70149e Fix common files for mbed 2014-07-30 14:07:43 +09:00
tmk
ee70fe59ee Fix debug.h and remove debug_config.h 2014-07-30 14:07:43 +09:00
tmk
c67ae2a6b5 Port action_* to mbed 2014-07-30 14:07:43 +09:00
tmk
04fe78ee0a Fix print and timer 2014-07-30 14:07:43 +09:00
tmk
867f115bee Port timer to mbed 2014-07-30 14:07:43 +09:00
tmk
f15b2691c9 Add keyboard/mbed_onekey 2014-07-30 14:07:43 +09:00
Kai Ryu
54360bf85b Move backlight to a separated bit to realize complex ledmap combinations 2014-07-25 14:24:57 +09:00
Kai Ryu
34886dfffb Implement ledmap and fix bugs 2014-07-24 15:03:58 +09:00
Kai Ryu
3ea4495bf5 Merge remote-tracking branch 'upstream/master'
Conflicts:
	common/action_util.c
2014-07-23 13:15:19 +09:00
Kai Ryu
b9c65be036 Implement ledmap-in-eeprom feature 2014-07-23 10:02:14 +09:00
Kai Ryu
aa7182e87c Implement led mapping feature 2014-07-20 12:52:56 +09:00
Kai Ryu
28ddc9c69f New branch for LED mapping feature 2014-07-19 11:27:00 +09:00
Kai Ryu
48725ce63d Merge branch 'master' into softpwm 2014-07-18 16:08:51 +09:00
Kai Ryu
3189449c7f Add backward compatibility to backlight action 2014-07-18 16:05:23 +09:00
Kai Ryu
41182d2b35 New branch for SoftPWM feature 2014-07-18 11:15:30 +09:00
Kai Ryu
819800ec35 Merge branch 'breathing_led' 2014-07-17 14:28:06 +09:00
Kai Ryu
6091b368d6 Add macro to make breathing led to use timer1 if timer3 is in other use 2014-07-17 14:16:35 +09:00
tmk
34373185b7 Merge pull request #124 from kairyu/6kro
USB 6KRO with pseudo- or half- NKRO feature
2014-07-07 12:46:12 +09:00
tmk
3eeb0a9623 Merge pull request #112 from shayneholmes/ee_nkro_use_reserved_bit
Adding NKRO virtual dip-switch, using existing bit in keymap byte.
2014-07-07 12:01:01 +09:00
Kai Ryu
bcdfa31e83 Merge branch '6kro' 2014-07-05 23:30:31 +09:00
Kai Ryu
14322aff76 More flexibility on matrix size 2014-05-26 17:31:01 +09:00
Kai Ryu
90cd35ad81 Remove trash of keymap_ex 2014-05-26 13:15:49 +09:00
Kai Ryu
64ee152c44 Merge branch 'master' into keymap_in_eeprom 2014-05-26 12:49:03 +09:00