1
0
Commit Graph

192 Commits

Author SHA1 Message Date
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
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
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
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
ac570686b6 New branch for 6KRO feature 2014-05-13 14:57:13 +09:00
tmk
22854eb71b 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
5e3f2d2b2e Make NKRO deafult when it is available
- NKRO is used only when keyboard_protocol = 1(report)
2014-04-27 04:16:49 +09:00
Shayne Holmes
e5bafff725 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
589d99b448 New macro: ACTION_BACKLIGHT_LEVEL(level)
To have full control of the backlight level.
2014-04-08 21:02:46 +02:00
tmk
cb3a547ebf Make modifiers 'weak' in macro 2014-01-28 10:55:51 +09:00
tmk
ac1acca8d7 Add description of keyboard report in report.h 2013-12-16 21:56:44 +09: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
tmk
4e5bce22de Add parenthses ito macro arguments 2013-11-21 23:23:57 +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
9d40be1990 Wait for USB starting up to make debug print available 2013-11-19 03:20:25 +09:00
tmk
676d94d137 Fix PS/2 mouse support 2013-11-02 04:30:08 +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
8819cf6bb1 Fix Tapping: release key immediately but modifier #65
- See https://github.com/tmk/tmk_keyboard/issues/60
- **Except for modifiers** a key pressed before the tapping starts should be released immediately
- 'Mod-Tap key'(like shift-;) didn't work from this fix: 4d0b3aa Fix Tapping: release of a key pressed before tap
This key sequence should register ':', not ';'. With the fix Shift is
released before settlement of tapping, this registers ';'.
    Shift   ~~___~~~~~~~
    ;(Tap)  ~~~____~~~~
2013-10-03 12:40:33 +09:00
tmk
7d692c492c Fix USB initilaize on LUFA
- Add print messages of USB intialize procesure.
- call out sei() in earlier stage. LUFA API doc of USB_Init() says:
interrupts must be enabled within 500ms ... to ensure that the host does
not time out whilst enumerating the device
- remove matrix_init() from suspend_wakeup_init(). It is not needed in
  fact and if matrix_init() takes long time to initialize it prevents
host emnumerating the device.
2013-09-21 22:47:03 +09:00
tmk
b2c7529ec9 Fix to bootmagic key configurable 2013-09-21 21:21:34 +09:00
tmk
58ca7b904b Merge branch 'tapping_fix60' 2013-09-19 22:16:55 +09:00
tmk
9f29fa6bf3 Fix version info command 2013-09-19 00:51:44 +09:00
tmk
0ca415004a Fix bootloader jump use word address
- Call of function pointer is compiled into 'icall' instruction.
It should use word address but it has used byte address :( It seems
jump has worked luckily by chance until now. why it worked?
2013-09-18 16:10:53 +09:00
tmk
4d0b3aace0 Fix Tapping: release of a key pressed before tap
- immediately process release event of a key pressed before tapping
2013-09-18 15:02:44 +09:00
tmk
c7faa51ee8 Fix action macros 2013-09-11 14:05:05 +09:00
tmk
8bc96ac571 Add version string 2013-09-11 13:44:54 +09:00
tmk
c274cc8cdc Fix tapping count over flow(issue #52) 2013-07-29 22:18:42 +09:00
tmk
daa4a4235f Add NKRO support for LUFA 2013-07-28 17:34:41 +09:00
tmk
05225dd9d8 Add bootmagic salt key to avoid accidental configuration 2013-07-24 00:41:28 +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