1
0
Commit Graph

17 Commits

Author SHA1 Message Date
Kai Ryu
15d9c0a692 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	common.mk
	common/action_util.c
2014-11-25 11:06:28 +09:00
Kai Ryu
8b070f0f54 Merge branch 'ledmap' 2014-08-03 11:33:02 +09:00
tmk
c67ae2a6b5 Port action_* to mbed 2014-07-30 14:07:43 +09:00
Kai Ryu
34886dfffb Implement ledmap and fix bugs 2014-07-24 15:03:58 +09:00
Kai Ryu
3ea4495bf5 Merge remote-tracking branch 'upstream/master'
Conflicts:
	common/action_util.c
2014-07-23 13:15:19 +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
7cdfbab020 Change logic of resetting keymap in eeprom 2014-04-11 12:12:03 +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
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
b2c7529ec9 Fix to bootmagic key configurable 2013-09-21 21:21:34 +09:00
tmk
05225dd9d8 Add bootmagic salt key to avoid accidental configuration 2013-07-24 00:41:28 +09:00
tmk
9de9d71952 Add default layer config to bootmagic 2013-06-22 16:24:56 +09:00
tmk
4e93b3fa67 Fix bootmagic and eeconfig for virtual DIP SW 2013-04-07 15:36:50 +09:00
tmk
d055e0633e Fix debug parameter setting in eeconfig 2013-03-11 15:10:56 +09:00
tmk
de8ef18a53 Add KEYCONF to eeconfig.c 2013-03-10 19:22:54 +09:00
tmk
4d64fd8faa Add bootmagic.c and fix bootloader_jump 2013-03-09 11:22:27 +09:00