Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6 from tmk/master | Jack Humbert | 2015-03-16 | 3 | -18/+23 |
|\ | | | | | pulling from tmk | ||||
| * | Merge pull request #151 from bswinnerton/typo-fix | tmk | 2015-01-19 | 1 | -6/+6 |
| |\ | | | | | | | Fixing typo in console mode | ||||
| | * | Fixing typo in console mode | Brooks Swinnerton | 2014-11-30 | 1 | -6/+6 |
| | | | |||||
| * | | Compensate timer during prower down | tmk | 2015-01-15 | 2 | -12/+17 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' | Jack Humbert | 2015-01-14 | 6 | -7/+35 |
|\| | | |||||
| * | | infinity: Add initial files for keyboard support | Jun Wako | 2015-01-04 | 2 | -1/+13 |
| | | | |||||
| * | | Ad hoc fix of print and debug for mbed | Jun Wako | 2015-01-04 | 1 | -2/+10 |
| | | | |||||
| * | | Fix modifier stuck of Lock command(#127) | tmk | 2015-01-01 | 1 | -0/+1 |
| | | | |||||
| * | | Remove unwanted white space | Jun Wako | 2014-12-26 | 1 | -3/+3 |
| | | | |||||
| * | | Add keycode for Fast Forward & Rewind | Colt Ma | 2014-12-26 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | KC_MEDIA_FAST_FORWARD KC_MEDIA_REWIND | ||||
* | | | led | Jack Humbert | 2014-12-11 | 2 | -1/+2 |
|/ / | |||||
* / | usb_usb: Update for new core layout | Jun Wako | 2014-12-05 | 1 | -5/+0 |
|/ | |||||
* | Fix debug.h | tmk | 2014-11-24 | 2 | -59/+7 |
| | |||||
* | Merge branch 'rn42' into merge_rn42 | tmk | 2014-11-24 | 42 | -325/+610 |
|\ | | | | | | | | | | | | | | | Conflicts: .gitignore common.mk common/debug_config.h common/print.h | ||||
| * | Remove MCU dependent code from common/keyboard.c | tmk | 2014-11-23 | 1 | -23/+0 |
| | | |||||
| * | Matrix power saving | tmk | 2014-11-23 | 3 | -0/+31 |
| | | |||||
| * | USB initialize when plug-in during battery powered | tmk | 2014-11-20 | 2 | -16/+36 |
| | | |||||
| * | Ad hoc fix of command API | tmk | 2014-07-30 | 2 | -11/+27 |
| | | |||||
| * | Fix timer.h to include AVR specific header | tmk | 2014-07-30 | 1 | -0/+5 |
| | | |||||
| * | Port ps2_usb to mbed | tmk | 2014-07-30 | 1 | -0/+1 |
| | | |||||
| * | Fix common files for mbed | tmk | 2014-07-30 | 15 | -32/+150 |
| | | |||||
| * | Fix debug.h and remove debug_config.h | tmk | 2014-07-30 | 3 | -105/+87 |
| | | |||||
| * | Port action_* to mbed | tmk | 2014-07-30 | 17 | -47/+83 |
| | | |||||
| * | Fix print and timer | tmk | 2014-07-30 | 8 | -16/+58 |
| | | |||||
| * | Port timer to mbed | tmk | 2014-07-30 | 3 | -19/+41 |
| | | |||||
| * | Add keyboard/mbed_onekey | tmk | 2014-07-30 | 3 | -94/+75 |
| | | |||||
* | | Merge branch 'action_fix' | tmk | 2014-11-18 | 2 | -1/+12 |
|\ \ | |||||
| * | | Add action 'Momentary switching with Modifiers' | tmk | 2014-09-29 | 2 | -1/+12 |
| | | | |||||
* | | | Add initializer of debug_config for GCC < 4.6.0(#144) | tmk | 2014-11-14 | 2 | -3/+12 |
| | | | |||||
* | | | Fix for 'unnamed field in initializer' GCC bug(Fix #143) | tmk | 2014-11-14 | 1 | -2/+5 |
|/ / | |||||
* | | Adhoc fix compile error of usb_usb | tmk | 2014-09-22 | 5 | -6/+23 |
| | | |||||
* | | Add serial_mouse_task in keyboard.c | tmk | 2014-08-26 | 1 | -0/+11 |
|/ | |||||
* | Merge pull request #124 from kairyu/6kro | tmk | 2014-07-07 | 1 | -0/+94 |
|\ | | | | | USB 6KRO with pseudo- or half- NKRO feature | ||||
| * | New branch for 6KRO feature | Kai Ryu | 2014-05-13 | 1 | -0/+94 |
| | | |||||
* | | Merge pull request #112 from shayneholmes/ee_nkro_use_reserved_bit | tmk | 2014-07-07 | 5 | -1/+14 |
|\ \ | |/ |/| | Adding NKRO virtual dip-switch, using existing bit in keymap byte. | ||||
| * | Adding NKRO virtual dip-switch, using existing bit in keymap byte. | Shayne Holmes | 2014-04-09 | 5 | -1/+14 |
| | | | | | | | | | | | | 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. | ||||
* | | NKRO is disable when SET_PROTOCOL(boot) | tmk | 2014-04-27 | 1 | -3/+3 |
| | | | | | | | | | | - Command can force to enable NKRO even when boot mode - After boot keyboard may be in boot mode due to BIOS' request | ||||
* | | Make NKRO deafult when it is available | tmk | 2014-04-27 | 4 | -6/+9 |
|/ | | | | - NKRO is used only when keyboard_protocol = 1(report) | ||||
* | New macro: ACTION_BACKLIGHT_LEVEL(level) | Ralf Schmitt | 2014-04-08 | 4 | -12/+26 |
| | | | | To have full control of the backlight level. | ||||
* | Make modifiers 'weak' in macro | tmk | 2014-01-28 | 1 | -2/+11 |
| | |||||
* | Add description of keyboard report in report.h | tmk | 2013-12-16 | 1 | -0/+20 |
| | |||||
* | Merge branch 'modstaptoggle' of git://github.com/simonmelhart/tmk_keyboard ↵ | tmk | 2013-11-28 | 2 | -0/+14 |
|\ | | | | | | | | | | | | | into simonmelhart-modstaptoggle Conflicts: common/action_code.h | ||||
| * | Add tap toggle modifiers | Simon Melhart | 2013-11-20 | 2 | -0/+14 |
| | | | | | | | | Including documentation. | ||||
* | | Add parenthses ito macro arguments | tmk | 2013-11-21 | 1 | -4/+4 |
| | | |||||
* | | Fix to build ps2_mouse with both LUFA and PJRC | tmk | 2013-11-20 | 6 | -24/+2 |
| | | | | | | | | | | - change API of ps2_mouse; ps2_mouse_task() - remove mouse_report from host.c | ||||
* | | Wait for USB starting up to make debug print available | tmk | 2013-11-19 | 1 | -0/+1 |
| | | |||||
* | | Fix PS/2 mouse support | tmk | 2013-11-02 | 1 | -1/+14 |
|/ | |||||
* | Add timeout option to MODS_ONESHOT #66 | tmk | 2013-10-07 | 2 | -23/+33 |
| | |||||
* | Fix mod stuck of MODS_KEY when leaving layer #62 | tmk | 2013-10-04 | 10 | -316/+323 |
| | | | | | | | - 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 | ||||
* | Fix Tapping: release key immediately but modifier #65 | tmk | 2013-10-03 | 2 | -18/+37 |
| | | | | | | | | | | - 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) ~~~____~~~~ |