1
0
Commit Graph

640 Commits

Author SHA1 Message Date
Kai Ryu
ee163c66ab Merge remote-tracking branch 'upstream/master'
Conflicts:
	common/avr/suspend.c
2015-04-07 14:57:03 +09:00
Jun Wako
f412e6f0b1 Fix for dfu-programmer 0.7 #182 2015-03-26 15:09:28 +09:00
Jun Wako
576345a918 m0110: Add support for international keyboard 2015-03-19 06:25:48 +09:00
Jun Wako
e82c6007e3 Fix call parameter of suspend_power_down() 2015-01-26 11:25:22 +09:00
tmk
b2ccaabda8 Merge pull request #176 from xauser/forhasu
NerD bugfix
2015-01-25 22:02:34 +09:00
Ralf Schmitt
30a606b445 Kitten Paw, fix main README link to project. 2015-01-21 21:16:49 +01:00
tmk
42be3086b2 Add external projects using tmk_keyboard 2015-01-19 12:43:30 +09:00
tmk
7d0617664a Merge pull request #148 from cub-uanic/patch-1
Fix keycode.txt
2015-01-19 12:13:21 +09:00
tmk
eb6aa59aac Merge pull request #151 from bswinnerton/typo-fix
Fixing typo in console mode
2015-01-19 11:58:04 +09:00
tmk
4985914e6e Merge branch 'vovcacik-ghost_squid' 2015-01-19 11:18:43 +09:00
tmk
ce48a06332 Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid
Conflicts:
	README.md
2015-01-19 11:17:05 +09:00
tmk
8679c165f8 Merge pull request #164 from cub-uanic/patch-2
Update other_projects.md - added TMK/Ergodox
2015-01-19 11:08:05 +09:00
tmk
a3f3bbe1a5 Fix typo 'keyobard' #166 2015-01-19 10:35:06 +09:00
tmk
7495f364fe Merge branch 'xauser-forhasu' 2015-01-19 10:21:01 +09:00
tmk
26f15278a9 Revert "Changed hotkey for bootloader jump"
This reverts commit f31cbc7219.
2015-01-19 10:20:20 +09:00
tmk
36878f3c78 Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-forhasu 2015-01-19 10:19:47 +09:00
Ralf Schmitt
97682e5505 Added missing keyboards to main README 2015-01-18 11:47:40 +01:00
Ralf Schmitt
a943e3e218 Added NerD 60% support 2015-01-18 11:43:37 +01:00
Ralf Schmitt
189b43b08b Changed hotkey for bootloader jump 2015-01-18 11:42:43 +01:00
tmk
fb78b6acf1 Merge branch 'rn42' 2015-01-15 17:12:26 +09:00
tmk
d61201e5e4 Fix power saving while USB suspended
- doesn't pwoer save while Bluetooth turns on
2015-01-15 17:08:49 +09:00
tmk
0060034b6c Fix lufa sendchar() infinite wait loop
- FrameNumber is not updated when adapter powered
- can be blocked in sendchar() when pluged into AC adapter
2015-01-15 17:08:48 +09:00
tmk
806a22efe2 Compensate timer during prower down 2015-01-15 17:08:48 +09:00
Kai Ryu
74397b510e Improve behavior of suspend
- Add suspend action for user defined suspend behavior
- Disable softpwm led when suspending
2015-01-09 11:45:27 +09:00
Jun Wako
10e6b7a211 Merge branch 'mbed_infinity' 2015-01-04 17:22:06 +09:00
Jun Wako
9218133d0b infinity: Add initial files for keyboard support 2015-01-04 17:21:43 +09:00
Jun Wako
58284dd19b infinity: Move project specific files to local 2015-01-04 17:21:43 +09:00
Jun Wako
629e3e17be Fix linker script for NVIC vector on RAM 2015-01-04 17:21:43 +09:00
Jun Wako
d239315cf1 Add keyboard/infinity 2015-01-04 17:21:43 +09:00
Jun Wako
3731921063 Fix ps2 protocol build using ps2_io.h 2015-01-04 17:21:43 +09:00
Jun Wako
1f33eecf84 Update makefiles to mbed-sdk 14666bb 2015-01-04 17:21:42 +09:00
Jun Wako
b4b17507b6 Ad hoc fix of print and debug for mbed 2015-01-04 17:21:42 +09:00
Oleg Kostyuk
b0363d2ecd Update other_projects.md - added TMK/Ergodox 2015-01-03 15:10:45 +02:00
tmk
9dd9deac04 bluefruit, pjrc: Update protocols for new API 2015-01-03 12:09:41 +09:00
tmk
c0880e5011 Fix modifier stuck of Lock command(#127) 2015-01-01 12:17:11 +09:00
Vlastimil Ovčáčík
1100998502 Added support for The Ghost Squid controller used for CM XT keyboard.
- initial commit
- created as clone of the kitten_paw subproject with pins adjusted for CM
  XT
2014-12-28 09:49:57 +01:00
Jun Wako
d2015da424 Merge branch 'mumchristmas-Apple_media_key_fix' #160 2014-12-26 13:30:18 +09:00
Jun Wako
d0ee08e173 Remove unwanted white space 2014-12-26 13:27:06 +09:00
Colt Ma
4b885ceb44 Add keycode for Fast Forward & Rewind
KC_MEDIA_FAST_FORWARD
KC_MEDIA_REWIND
2014-12-26 11:02:25 +08:00
tmk
e8d098e7cf [ps2,terminal_usb] Quick fix for build problem 2014-12-24 11:11:07 +09:00
Jun Wako
3d41f69b53 Merge branch 'usb_usb_hub' 2014-12-11 01:00:32 +09:00
Jun Wako
d59ab71485 Add USB Hub support 2014-12-10 23:52:38 +09:00
Jun Wako
66cfd88bd0 Add submodule legitimate USB_Host_Shield_2.0 2014-12-10 15:54:24 +09:00
Jun Wako
f2712ee19f Remove submodule USB_Host_Shield_2.0 2014-12-10 15:20:32 +09:00
Kai Ryu
9794deaada Add more build options to version info of magic command 2014-12-10 11:05:47 +09:00
Kai Ryu
f2750caad9 Fix 6KRO compatibility issue with NKRO 2014-12-10 10:21:58 +09:00
Jun Wako
3a5a865980 usb_usb: Update for new core layout 2014-12-05 09:59:08 +09:00
Brooks Swinnerton
f6615d9557 Fixing typo in console mode 2014-11-30 13:27:59 -05:00
Kai Ryu
1ac468aa5d Improve ledmap feature
- Change date type of ledmap from byte to word
- New reverse bit, reversing binding stats
- Fix minor bugs
2014-11-25 18:23:16 +09:00
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