1
0
Commit Graph

265 Commits

Author SHA1 Message Date
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
Kai Ryu
b82c4a8da3 Improve flexibility 2014-05-26 12:48:10 +09:00
Kai Ryu
9c1d9d7bb3 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
d37b6d7d5b Remove keymap_ex changes 2014-05-26 12:04:31 +09:00
Kai Ryu
ac570686b6 New branch for 6KRO feature 2014-05-13 14:57:13 +09:00
Kai Ryu
5ccabc844c Fix compatibility with NKRO 2014-05-13 14:10:56 +09:00
Kai Ryu
4f1caf1a90 Clean code of 6KRO 2014-05-13 13:55:03 +09:00
Kai Ryu
ee9913a863 Implement 6KRO feature 2014-05-12 18:47:50 +09:00
Kai Ryu
d2a57d82d5 New branch for 6KRO feature 2014-05-12 17:26:31 +09:00
Kai Ryu
8748b6080f Fix some definition and declaration 2014-05-07 11:39:07 +09:00
Kai Ryu
f2fd5127e1 Merge remote-tracking branch 'upstream/master' 2014-05-07 11:16:59 +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
Kai Ryu
f82a77cc15 Simplifiy breathing led feature and code 2014-04-18 14:33:57 +09:00
Kai Ryu
e26869d70a Change software pwm method to fix blink issue 2014-04-18 12:12:59 +09:00
Kai Ryu
3c8412b1e5 Bug fix and optimization of breathing led 2014-04-16 12:12:15 +09:00
Kai Ryu
91b149f785 New branch for breathing led feature 2014-04-15 16:28:48 +09:00
Kai Ryu
7cdfbab020 Change logic of resetting keymap in eeprom 2014-04-11 12:12:03 +09:00
Kai Ryu
d8b992585e Support for odd-byte keymap 2014-04-10 15:55:11 +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
Kai Ryu
8a3b663762 Add PS2 mouse support for gh60 2014-04-08 18:05:39 +09:00
Kai Ryu
8b75dd43ba Extend reset eeconfig of bootmagic to reset keymap too 2014-04-08 17:59:31 +09:00
Kai Ryu
55f603394d New branch for keymap-in-eeprom feature 2014-04-03 13:46:03 +09:00
tmk
cb3a547ebf Make modifiers 'weak' in macro 2014-01-28 10:55:51 +09:00
Kai Ryu
2e30e38479 Some more implementation of led matrix 2014-01-14 16:12:21 +09:00
Kai Ryu
be407eb8d3 Some implementations of led matrix 2014-01-13 22:04:24 +09:00
Kai Ryu
6c71b19c77 Add files for led matrix 2014-01-11 22:24:32 +09:00
Kai Ryu
ba917cb86f Fix for an issue about backlight on 2014-01-11 22:17:36 +09:00
Kai Ryu
3c50f78dbe Add some flexible define for keymap_ex 2014-01-10 09:14:11 +09:00
tmk
ac1acca8d7 Add description of keyboard report in report.h 2013-12-16 21:56:44 +09:00
Kai Ryu
63b3ea9a1e 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
17bf466ab5 Change checksum algorism 2013-12-02 11:22:34 +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
Kai Ryu
09d9249310 Fix some debug codes 2013-11-22 10:58:02 +09:00
tmk
4e5bce22de Add parenthses ito macro arguments 2013-11-21 23:23:57 +09:00
Kai Ryu
e5a48615ec Fix confusion of size and count 2013-11-21 13:44:32 +09:00
Kai Ryu
066f3e4c9b New feature to support external keymap in eeprom 2013-11-21 13:00:45 +09:00
Kai Ryu
4f3b84f4c5 Add custom backlight feature 2013-11-21 12:33:03 +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
tmk
3e023e5b0c Cancel tapping when interrupted by other key 2013-07-21 03:21:57 +09:00
tmk
f8fbecff4d Change name ACT_LAYER_TAP1 to ACT_LAYER_TAP_EXT 2013-07-20 03:27:36 +09:00
tmk
25ad212c4a Add BACKLIGHT_ENABLE conditional 2013-06-23 09:14:58 +09:00
tmk
82aec46722 Fix typo 2013-06-22 17:32:53 +09:00
Wraul
1eb8523e95 Add support for backlight 2013-06-22 17:23:36 +09:00
tmk
9de9d71952 Add default layer config to bootmagic 2013-06-22 16:24:56 +09:00
Mathias Andersson
ddf1759dbe Fixes to sleep LED.
Add help text.
Add missing SLEEP_LED_ENABLE checks.
2013-05-27 18:36:00 +02:00
tmk
796defa86c Fix deprecated 'prog_*' typedef - Issue #34
- Remove prog_char from xpritnf
- Remove prog_macro_t from acton_macro

avr-libc-1.8 removed 'prog_*' typedef because the usage of
the __progmem__ attribute on a type is not supported in GCC.
http://www.nongnu.org/avr-libc/changes-1.8.html
2013-05-21 10:16:55 +09:00
tmk
adbd15d5bd Fix command.c and README 2013-05-15 00:23:36 +09:00
tmk
ff2d276b19 Use dprint and dprintf for debug 2013-05-14 16:19:40 +09:00
tmk
d9c06db600 Add xprintf(xitoa) from elm-chan.org 2013-05-14 16:16:57 +09:00
tmk
540d0700dc Remove common/controller_teensy.h 2013-04-13 11:30:08 +09:00
tmk
09e1eded8b Add media eject key support from tufty 2013-04-12 11:25:59 +09:00
tmk
4e93b3fa67 Fix bootmagic and eeconfig for virtual DIP SW 2013-04-07 15:36:50 +09:00
tmk
c26a5eb2ac Fix keymap for new actions 2013-04-05 03:44:42 +09:00
tmk
fbea2a3aae Fix keymap of hhkb for new actions 2013-04-05 03:27:10 +09:00
tmk
489fd75fdf Fix keymap of gh60 2013-04-05 01:39:17 +09:00
tmk
f9a7e224a4 Fix ACT_MODS action and switch_default_layer command 2013-04-04 16:29:44 +09:00
tmk
ebe798f081 Add file action_code.h 2013-04-04 15:16:03 +09:00
tmk
d612242692 Fix ACTION_LAYER macros 2013-04-03 01:33:04 +09:00
tmk
c6d88d2795 Rename file layer_switch to action_layer 2013-04-02 17:44:24 +09:00
tmk
cc8e66754b Refine ACT_LAYER and ACT_LAYER_TAP
- Remove ACT_LAYER_BITOP
2013-04-02 16:09:43 +09:00
tmk
10f33a3e48 Remove ACT_KEYMAP and ACT_OVERLAY
- Remove ACT_OVERLAY
- Rename ACT_KEYMAP to ACT_LAYER
- Add ACT_LAYER_BITOP
2013-03-31 22:47:19 +09:00
tmk
c69f7e1069 Add action_tapping.[ch] for refactoring 2013-03-29 02:46:05 +09:00
tmk
ac509aa079 Add sleep LED test command 2013-03-27 15:21:50 +09:00
tmk
afc3148e23 Add supsend and wakeup to pjrc stack 2013-03-27 15:18:08 +09:00
tmk
2c0bb5e7e6 Add common/suspend.c 2013-03-25 01:46:32 +09:00