Kai Ryu
314746dc8c
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
common/action_util.c
2014-07-23 13:15:19 +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
Kai Ryu
41cbb1bace
New branch for 6KRO feature
2014-05-13 14:57:13 +09:00
Kai Ryu
d856998d53
Fix compatibility with NKRO
2014-05-13 14:10:56 +09:00
Kai Ryu
79f7f78678
Clean code of 6KRO
2014-05-13 13:55:03 +09:00
Kai Ryu
59c8417c9e
Implement 6KRO feature
2014-05-12 18:47:50 +09:00
Kai Ryu
a45dbd2728
New branch for 6KRO feature
2014-05-12 17:26:31 +09:00
Kai Ryu
74c4395454
Fix some definition and declaration
2014-05-07 11:39:07 +09:00
Kai Ryu
f46568ca0a
Merge remote-tracking branch 'upstream/master'
2014-05-07 11:16:59 +09:00
tmk
ca8de4f93d
NKRO is disable when SET_PROTOCOL(boot)
...
- Command can force to enable NKRO even when boot mode
- After boot keyboard may be in boot mode due to BIOS' request
2014-04-27 05:36:41 +09:00
tmk
b0a91cd565
Make NKRO deafult when it is available
...
- NKRO is used only when keyboard_protocol = 1(report)
2014-04-27 04:16:49 +09:00
Kai Ryu
1b2685f374
Simplifiy breathing led feature and code
2014-04-18 14:33:57 +09:00
Kai Ryu
5cc4c69fae
Change software pwm method to fix blink issue
2014-04-18 12:12:59 +09:00
Kai Ryu
f121a98ae3
Bug fix and optimization of breathing led
2014-04-16 12:12:15 +09:00
Kai Ryu
b4f3febe8d
New branch for breathing led feature
2014-04-15 16:28:48 +09:00
Kai Ryu
f8443e306b
Change logic of resetting keymap in eeprom
2014-04-11 12:12:03 +09:00
Kai Ryu
237bd9e5fe
Support for odd-byte keymap
2014-04-10 15:55:11 +09:00
Shayne Holmes
c035c27c1b
Adding NKRO virtual dip-switch, using existing bit in keymap byte.
...
This takes the last, reserved bit there, but doesn't necessitate
a revision to the magic number because it doesn't alter byte order.
Add reference to NKRO virtual dip-switch to documentation.
2014-04-09 15:54:16 -07:00
Ralf Schmitt
b5fb2dbc1e
New macro: ACTION_BACKLIGHT_LEVEL(level)
...
To have full control of the backlight level.
2014-04-08 21:02:46 +02:00
Kai Ryu
5977267388
Add PS2 mouse support for gh60
2014-04-08 18:05:39 +09:00
Kai Ryu
1c80d8d41c
Extend reset eeconfig of bootmagic to reset keymap too
2014-04-08 17:59:31 +09:00
Kai Ryu
6aeb9cac41
New branch for keymap-in-eeprom feature
2014-04-03 13:46:03 +09:00
tmk
76311eeb2a
Make modifiers 'weak' in macro
2014-01-28 10:55:51 +09:00
Kai Ryu
6961b3d44a
Some more implementation of led matrix
2014-01-14 16:12:21 +09:00
Kai Ryu
f691f13ba2
Some implementations of led matrix
2014-01-13 22:04:24 +09:00
Kai Ryu
44845ab9dd
Add files for led matrix
2014-01-11 22:24:32 +09:00
Kai Ryu
fe4e5696a7
Fix for an issue about backlight on
2014-01-11 22:17:36 +09:00
Kai Ryu
ac5b5ff533
Add some flexible define for keymap_ex
2014-01-10 09:14:11 +09:00
tmk
eaec2b4252
Add description of keyboard report in report.h
2013-12-16 21:56:44 +09:00
Kai Ryu
5e0eb1ec7d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
common.mk
common/keyboard.c
keyboard/gh60/Makefile
keyboard/gh60/keymap_hasu.c
keyboard/gh60/matrix.c
2013-12-12 13:38:49 +09:00
Kai Ryu
334ae50bc3
Change checksum algorism
2013-12-02 11:22:34 +09:00
tmk
08cd804896
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
Kai Ryu
eb8b801043
Fix some debug codes
2013-11-22 10:58:02 +09:00
tmk
2cec799626
Add parenthses ito macro arguments
2013-11-21 23:23:57 +09:00
Kai Ryu
91f86df368
Fix confusion of size and count
2013-11-21 13:44:32 +09:00
Kai Ryu
d926950e17
New feature to support external keymap in eeprom
2013-11-21 13:00:45 +09:00
Kai Ryu
8451031e0a
Add custom backlight feature
2013-11-21 12:33:03 +09:00
