1
0
Commit Graph

52 Commits

Author SHA1 Message Date
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
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
7ab4f120ee Adhoc fix compile error of usb_usb 2014-09-22 10:42:20 +09:00
Kai Ryu
7e2ab6c1b3 Add build option FADING_LED_ENABLE 2014-08-25 16:29:09 +09:00
tmk
412ca57be1 Fix common files for mbed 2014-07-30 14:07:43 +09:00
tmk
197a921f44 Port action_* to mbed 2014-07-30 14:07:43 +09:00
tmk
d7004b97d8 Port timer to mbed 2014-07-30 14:07:43 +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
0054ff79cd New branch for SoftPWM feature 2014-07-18 11:15:30 +09:00
Kai Ryu
0ba386eb73 Merge branch '6kro' 2014-07-05 23:30:31 +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
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
b4f3febe8d New branch for breathing led feature 2014-04-15 16:28:48 +09:00
Kai Ryu
6aeb9cac41 New branch for keymap-in-eeprom feature 2014-04-03 13:46:03 +09:00
Kai Ryu
6961b3d44a Some more implementation of led matrix 2014-01-14 16:12:21 +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
d926950e17 New feature to support external keymap in eeprom 2013-11-21 13:00:45 +09:00
tmk
755b81f0ad Fix PS/2 mouse support 2013-11-02 04:30:08 +09:00
tmk
a5811211ac 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
cd2c78ba4e Fix VERSION: add opton --always to git describe 2013-10-03 13:27:04 +09:00
tmk
fb2ff003dd Fix version info command 2013-09-19 00:51:44 +09:00
tmk
be3ec3a3dc Add build option KEYMAP_SECTION for keymap editor 2013-09-11 14:01:47 +09:00
tmk
57c52a8789 Add version string 2013-09-11 13:44:54 +09:00
Wraul
fa633c571c Add support for backlight 2013-06-22 17:23:36 +09:00
tmk
6049f2e7d1 Add xprintf(xitoa) from elm-chan.org 2013-05-14 16:16:57 +09:00
tmk
b92c7fd612 Fix bootmagic and eeconfig for virtual DIP SW 2013-04-07 15:36:50 +09:00
tmk
f903bcddbd Rename file layer_switch to action_layer 2013-04-02 17:44:24 +09:00
tmk
d2d06ebf5f Add action_tapping.[ch] for refactoring 2013-03-29 02:46:05 +09:00
tmk
0caaa6e3d3 Add common/suspend.c 2013-03-25 01:46:32 +09:00
tmk
6fe6a03c2f Add NO_ACTION_ONESHOT config option 2013-03-21 14:42:40 +09:00
tmk
27cb3f4fab Add COMMAND_ENABLE build option 2013-03-19 16:05:53 +09:00
tmk
a063e4544c Add NO_PRINT and NO_DEBUG config options.
- NO_PRINT: disable print.h API(also disable debug.h)
- NO_DEBUG: disable debug.h API
2013-03-19 14:08:40 +09:00
tmk
5bd0a8e724 Add breathing sleep LED during USB suspend 2013-03-16 17:24:05 +09:00
tmk
9c363dc9a3 Add build option BOOTMAGIC_ENABLE 2013-03-11 15:28:46 +09:00
tmk
1f312d2c85 Add bootmagic.c and fix bootloader_jump 2013-03-09 11:22:27 +09:00
tmk
e26c25f23e Add eeconfig.c - eeprom stored paramerters 2013-03-07 03:30:08 +09:00
tmk
4039537bce Replace layer_stack with layer_switch 2013-02-15 18:48:36 +09:00
tmk
064a11528f Add layer_stack files taking apart from action.c 2013-02-15 13:47:41 +09:00
tmk
390cdf0c8e Add macro feature. 2013-02-04 22:53:45 +09:00
tmk
3b8abfb0c3 Clean code. 2013-01-28 14:06:42 +09:00
tmk
770cfcff99 Add initial fix for new keymap. 2012-12-16 02:32:07 +09:00
tmk
4edc5ab99c Initial version of new code for layer switch is added. 2012-10-17 15:55:37 +09:00
tmk
d9b9098b20 test build of 'Host shield' in minimal env. 2012-08-28 21:56:15 +09:00
tmk
9660bae5b1 Add CONSOLE_ENABLE build option to LUFA. 2012-07-20 13:08:18 +09:00
tmk
1288130200 Add protocol/lufa. LUFA supported now. 2012-06-28 23:05:21 +09:00
tmk
63d82fcaeb Fixed Makefile to adjust new directories. 2012-06-07 12:35:24 +09:00