1
0
Commit Graph

564 Commits

Author SHA1 Message Date
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
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
Jun Wako
3a5a865980 usb_usb: Update for new core layout 2014-12-05 09:59:08 +09:00
tmk
7b42ccbe36 Merge branch 'u2_fix' 2014-11-24 16:19:00 +09:00
tmk
630e11e7c4 Fix endpoint buffer setting for AT90USB82/162. 2014-11-24 16:04:03 +09:00
tmk
a37e6270c1 Merge branch 'merge_rn42' 2014-11-24 15:36:53 +09:00
tmk
01b175b134 Fix debug.h 2014-11-24 14:33:50 +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
16e40e658f Remove MCU dependent code from common/keyboard.c 2014-11-23 13:38:10 +09:00
tmk
5ed714f3eb Matrix power saving 2014-11-23 13:08:05 +09:00
tmk
59fc299e15 USB initialize when plug-in during battery powered 2014-11-20 17:24:56 +09:00
tmk
2bab365758 Merge branch 'action_fix' 2014-11-18 04:10:48 +09:00
tmk
7a318f1e98 Add initializer of debug_config for GCC < 4.6.0(#144) 2014-11-14 22:53:25 +09:00
tmk
cc6806d573 Fix for 'unnamed field in initializer' GCC bug(Fix #143) 2014-11-14 17:49:48 +09:00
Simon Stapleton
adb178df5d ignore files with trailing ~ 2014-11-14 17:25:49 +09:00
tmk
e0ebfcaa8d Merge pull request #142 from 0mark/master
fixed vusb variant of converter ps2usb
2014-11-14 04:56:00 +09:00
Stefan Mark
c4607a3154 fixed vusb variant of converter ps2usb 2014-11-13 12:07:56 +01:00
tmk
b28f8bd637 Add action 'Momentary switching with Modifiers' 2014-09-29 10:29:33 +09:00
tmk
11206ca42f Fix typo of variable name 2014-09-24 15:52:31 +09:00