1
0
Commit Graph

17 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
Kai Ryu
22273c5edf Merge branch 'ledmap' 2014-08-03 11:33:02 +09:00
tmk
197a921f44 Port action_* to mbed 2014-07-30 14:07:43 +09:00
Kai Ryu
0c5e2e8f22 Implement ledmap and fix bugs 2014-07-24 15:03:58 +09:00
Kai Ryu
314746dc8c Merge remote-tracking branch 'upstream/master'
Conflicts:
	common/action_util.c
2014-07-23 13:15:19 +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
f8443e306b Change logic of resetting keymap in eeprom 2014-04-11 12:12:03 +09:00
Shayne Holmes
c035c27c1b 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
1c80d8d41c Extend reset eeconfig of bootmagic to reset keymap too 2014-04-08 17:59:31 +09:00
Kai Ryu
6aeb9cac41 New branch for keymap-in-eeprom feature 2014-04-03 13:46:03 +09:00
tmk
651ad76f93 Fix to bootmagic key configurable 2013-09-21 21:21:34 +09:00
tmk
14d1af6231 Add bootmagic salt key to avoid accidental configuration 2013-07-24 00:41:28 +09:00
tmk
063614a8c2 Add default layer config to bootmagic 2013-06-22 16:24:56 +09:00
tmk
b92c7fd612 Fix bootmagic and eeconfig for virtual DIP SW 2013-04-07 15:36:50 +09:00
tmk
f0ffb79683 Fix debug parameter setting in eeconfig 2013-03-11 15:10:56 +09:00
tmk
e7ffad1f10 Add KEYCONF to eeconfig.c 2013-03-10 19:22:54 +09:00
tmk
1f312d2c85 Add bootmagic.c and fix bootloader_jump 2013-03-09 11:22:27 +09:00