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
|
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 |
|
tmk
|
b28f8bd637
|
Add action 'Momentary switching with Modifiers'
|
2014-09-29 10:29:33 +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
|
7ab4f120ee
|
Adhoc fix compile error of usb_usb
|
2014-09-22 10:42:20 +09:00 |
|
tmk
|
8b78232f9d
|
Add serial_mouse_task in keyboard.c
|
2014-08-26 17:36:44 +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
|
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
|
daf232794e
|
Port ps2_usb to 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 |
|
tmk
|
197a921f44
|
Port action_* to mbed
|
2014-07-30 14:07:43 +09:00 |
|
tmk
|
81504a8ef0
|
Fix print and timer
|
2014-07-30 14:07:43 +09:00 |
|
tmk
|
d7004b97d8
|
Port timer to mbed
|
2014-07-30 14:07:43 +09:00 |
|
tmk
|
89d19ff866
|
Add keyboard/mbed_onekey
|
2014-07-30 14:07:43 +09:00 |
|
Kai Ryu
|
1c3b8f810f
|
Move backlight to a separated bit to realize complex ledmap combinations
|
2014-07-25 14:24:57 +09:00 |
|
Kai Ryu
|
0c5e2e8f22
|
Implement ledmap and fix bugs
|
2014-07-24 15:03:58 +09:00 |
|
Kai Ryu
|
314746dc8c
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
common/action_util.c
|
2014-07-23 13:15:19 +09:00 |
|
Kai Ryu
|
c402923529
|
Implement ledmap-in-eeprom feature
|
2014-07-23 10:02:14 +09:00 |
|
Kai Ryu
|
cf06612edf
|
Implement led mapping feature
|
2014-07-20 12:52:56 +09:00 |
|
Kai Ryu
|
a34c3bf088
|
New branch for LED mapping feature
|
2014-07-19 11:27:00 +09:00 |
|
Kai Ryu
|
83cb4efc6b
|
Merge branch 'master' into softpwm
|
2014-07-18 16:08:51 +09:00 |
|
Kai Ryu
|
15c6e176c9
|
Add backward compatibility to backlight action
|
2014-07-18 16:05:23 +09:00 |
|
Kai Ryu
|
0054ff79cd
|
New branch for SoftPWM feature
|
2014-07-18 11:15:30 +09:00 |
|
Kai Ryu
|
2054605530
|
Merge branch 'breathing_led'
|
2014-07-17 14:28:06 +09:00 |
|
Kai Ryu
|
b9639cc703
|
Add macro to make breathing led to use timer1 if timer3 is in other use
|
2014-07-17 14:16:35 +09:00 |
|
tmk
|
5d4fc958e3
|
Merge pull request #124 from kairyu/6kro
USB 6KRO with pseudo- or half- NKRO feature
|
2014-07-07 12:46:12 +09:00 |
|
tmk
|
a9600e3646
|
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
|
0ba386eb73
|
Merge branch '6kro'
|
2014-07-05 23:30:31 +09:00 |
|
Kai Ryu
|
c7592bbd1f
|
More flexibility on matrix size
|
2014-05-26 17:31:01 +09:00 |
|
Kai Ryu
|
ee5ca258ee
|
Remove trash of keymap_ex
|
2014-05-26 13:15:49 +09:00 |
|
Kai Ryu
|
b461564744
|
Merge branch 'master' into keymap_in_eeprom
|
2014-05-26 12:49:03 +09:00 |
|
Kai Ryu
|
f0eb462c0a
|
Improve flexibility
|
2014-05-26 12:48:10 +09:00 |
|
Kai Ryu
|
0ff80dad6a
|
Merge branch 'keymap_in_eeprom'
Conflicts:
common.mk
common/keyboard.c
keyboard/gh60/Makefile
keyboard/gh60/Makefile.pjrc
|
2014-05-26 12:12:51 +09:00 |
|
Kai Ryu
|
9b73c1e4fc
|
Remove keymap_ex changes
|
2014-05-26 12:04:31 +09:00 |
|