1
0
Commit Graph

1326 Commits

Author SHA1 Message Date
Kai Ryu
da21e0c7d8 Merge remote-tracking branch 'upstream/master' 2016-06-27 10:04:01 +09:00
tmk
2983af4f9a Merge pull request #365 from p3lim/patch-1
README missing link
2016-06-23 14:08:18 +09:00
Adrian L Lange
38ab23568e README missing link 2016-06-22 13:51:19 +02:00
tmk
e590b64703 Update orphan/README.md 2016-06-22 12:54:14 +09:00
tmk
649151cbeb Merge branch 'orphans' 2016-06-22 11:37:24 +09:00
tmk
885e7adb18 Move some projects to 'orphan' directory 2016-06-22 11:32:37 +09:00
tmk
5c277a6687 Merge branch 'remote_wakeup_32u2_fix' 2016-06-21 14:22:11 +09:00
tmk
a65fa6437c core: Fix USB remote wakeup on ATmega32U2 #361 2016-06-21 14:19:17 +09:00
tmk
338744ba2f Merge branch 'usb_usb_multiple_keyboard_share' 2016-06-21 14:17:36 +09:00
tmk
148c6a5175 usb_usb: Add multiple keyboard support
it supports four keyboards and two cascaded hubs
2016-06-21 13:49:06 +09:00
Kai Ryu
55c3937ca0 Merge remote-tracking branch 'upstream/master' 2016-06-14 13:33:26 +09:00
tmk
60b88f155e hhkb: Fix links in README.md. Close #358 2016-06-08 09:54:19 +09:00
tmk
ccd8e18609 Merge branch 'report_descriptor_fix' 2016-06-08 05:31:54 +09:00
tmk
7ce326dee5 core: Fix Logical Maximum in report descriptor 2016-06-08 05:17:47 +09:00
tmk
df1e5a5aab Merge branch 'report_descriptor_fix' 2016-06-08 03:58:59 +09:00
tmk
279876ef5e core: Fix LUFA report descriptor
- Logical Min/Max contains signed value and needs 16 bit to indicate 255
https://github.com/jackhumbert/qmk_firmware/issues/312
2016-06-06 01:44:29 +09:00
tmk
f37805e698 Merge pull request #355 from papodaca/XT
Add converter for XT keyboards, fixes #309
2016-06-05 00:14:42 +09:00
tmk
1bce71fbf7 Merge branch 'adb_mediakey' 2016-06-04 23:36:20 +09:00
tmk
b653b622a6 adb_usb: Add support for Apple Adjustable keybaord media keys 2016-06-04 19:31:44 +09:00
tmk
230ed4bdef core: change API of adb.c to accept device address 2016-06-04 19:27:16 +09:00
Ethan Apodaca
bafb746485 Update XT converter readme.
- Add mac os garbage to git ignore.
2016-06-01 08:34:14 -07:00
Ethan Apodaca
83331cf6a2 Merge pull request #1 from alh84001/patch-1
Update config.h
2016-06-01 08:22:37 -07:00
Matija Kovacic
5cbc226add Update config.h
Please see the post at https://deskthority.net/keyboards-f2/tmk-firmware-for-xt-keyboards-t13847.html
2016-06-01 16:57:31 +02:00
tmk
4d9e66baec adb_usb: Fix swap ISO codes bug 2016-05-25 10:25:32 +09:00
tmk
3fe8e1c238 Merge commit '20b787fc1284176834cbe7ca2134e4b36bec5828' 2016-05-22 22:49:29 +09:00
tmk
20b787fc12 Squashed 'tmk_core/' changes from d5c5ac6..8da1898
8da1898 Merge remote-tracking branch 'flabbergast/chibios'
f0fdd8a ChibiOS: update instructions.md.
24dd0b5 ChibiOS: update mk to match chibios/master.
cdee266 Merge branch 'develop' into chibios
221663c Fix signatre of layer state change hooks
5a364cb Merge branch 'hotfix-chibios' into develop
af664cd Merge branch 'newapi' into develop
04feeaa Clean hook codes
0ca106d Fix code and table in hook.txt
714d418 Add hook document from njbair's work
b715129 Chibios: add default location for chibios-contrib.
fb3a323 Merge branch 'master' into newapi
8b7fbbd Merge branch 'master' into develop
e49851a Chibios: add default location for chibios-contrib.

git-subtree-dir: tmk_core
git-subtree-split: 8da189851ba83b9bb46a4290cd76b7b7fef6134e
2016-05-22 22:49:29 +09:00
tmk
57f0ab5563 Merge branch 'flabbergast-update' 2016-05-22 21:13:13 +09:00
flabbergast
82e8e6fbaa Chibios: update examples to current chibios git.
Match the changes in mainline chibios:
 - update chconf.h
 - update supplied ld scripts structure
 - update Teensy instructions (switch to official
    chibios and introduce contrib)
2016-05-22 20:14:42 +09:00
tmk
e661296200 core: Add comment of register 3 of ADB 2016-05-20 12:15:25 +09:00
tmk
41d8811c35 Merge branch 'adb_iso_fix' 2016-05-20 03:32:11 +09:00
tmk
4fc0efd3ab adb_usb: reinitialize for plug-in after startup 2016-05-20 03:30:46 +09:00
tmk
f43a2df761 Merge branch 'adb_iso_fix' 2016-05-19 16:29:13 +09:00
tmk
49f44a2aed adb_usb: autodetect ISO keyboards and swap codes 2016-05-19 16:26:01 +09:00
tmk
d702fe7504 core: Add adb_host_talk() 2016-05-19 16:25:13 +09:00
tmk
75854878cc Merge pull request #347 from omenlabs/master
Add hardware serial support for sun_usb converter
2016-05-16 15:10:11 +09:00
John Hickey
d5d58f566d Make Bell and Click work on Sun Type 5c.
It seems that the Sun Type 5c keyboard will not send the arrow key
codes if both shift keys are pressed.  To get bell and keyclick
working, I used Home/End as toggle keys instead.
2016-05-14 14:29:05 -07:00
John Hickey
d3332d32da Add hardware serial support for sun_usb converter
Tested with a Sun Type 5c keyboard and a 7404 inverter.
2016-05-09 22:56:33 -07:00
tmk
e9a54995bd Merge pull request #341 from esell/master
Update macro names in bluefruit protocol
2016-05-06 08:28:50 +09:00
esell
90105c6f8b Merge pull request #1 from esell/bluefruit
update macro names in bluefruit
2016-05-05 12:50:59 -06:00
esell
0c8c77450c update macro names in bluefruit 2016-05-05 12:50:05 -06:00
tmk
3c109203c3 x68k_usb: Add toggle LED sample 2016-04-29 15:36:26 +09:00
tmk
e7808f7ea4 x68k_usb: Convert legacy keymap into current one 2016-04-29 15:30:32 +09:00
tmk
7847d5dd9f news_usb: Add TMK converter support 2016-04-29 14:54:52 +09:00
tmk
d4982a21ac Fix a link in README.md 2016-04-21 14:39:42 +09:00
tmk
b1d691bcfd Merge branch 'master' of github.com:tmk/tmk_keyboard 2016-04-21 14:37:59 +09:00
tmk
53bd4a01be Merge commit '71381457fa1311dfa0b58ba882a96db740640871'
Conflicts:
	tmk_core/doc/keymap.md
2016-04-21 14:37:16 +09:00
tmk
71381457fa Squashed 'tmk_core/' changes from ee8c5ba..d5c5ac6
d5c5ac6 Merge branch 'develop'
5957682 Merge branch 'hotfix-mediakey'
a478c62 Merge branch 'hotfix-vusb'
cccebfe Merge branch 'njbair-docfix'
0aaab57 Clean up wording in keymap example
dc8bbc3 Clarify layer precedence
9e0b4c1 clarify layer documentation
915eb48 core: Fix media/consumer keys
88f90f3 Fix for VUSB configuration
3e290cd Fix including board.mk in chibios.mk
32c69e0 Merge branch 'newapi' into develop
c9a56f9 Merge remote-tracking branch 'flabbergast/chibios' into develop
01e33ea Fix chibios and mbed common.mk for hook.c
bea79d9 hook: Change func name of usb events
3e97536 hook: Change file and func names(*_hook -> hook_*)
c286d8c Merge pull request #10 from fredizzimo/chibios-contrib2
062d74e Update ChibiOS instructions
d47150f Add support for new version of ChibiOS and Contrib
62b5401 Chibios: disable LTO (link-time optimisation).
c64e9aa hooks: Fix for LUFA
54e68b0 hooks: Remove led_restore_hook
325c09d Chibios: make the default bootloader_jump redefinable (weak).
078c722 Chibios: fix STM32_BOOTLOADER_ADDRESS name.
e73cfe5 hooks: Fix for keyboard LED update
e6120c5 Implement basic hooks.
7c370e9 Chibios: Update the main chibios README.
7f0198d Chibios: implement sleep LED for STM32.
afef9b4 Fix hard-coded path of CHIBIOS
95c5b19 Merge pull request #7 from fredizzimo/sysvsize
27128a8 Sysv format for ChibiOS arm-none-eabi-size
d4b8e68 core: Fix chibios user compile options
b85d462 Merge branch 'chibios' of https://github.com/flabbergast/tmk_keyboard into flabbergast_chibios
de41aa1 core: Fix ps2_mouse.c debug print
d79d925 Removed duplicate debug message code and surrounded it with IFDEF as needed
8f28589 Chibios: Revert common.mk change (fix AVR linking problem).
ec9eff2 Chibios: cleanup usb_main code.
28c4665 Chibios: Fix a HardFault bug (wait after start).

git-subtree-dir: tmk_core
git-subtree-split: d5c5ac63e60dfc6da6661a21bd968b4d577a27d5
2016-04-21 14:35:48 +09:00
tmk
38931d604f Merge pull request #327 from grettke/patch-1
Extenal -> External
2016-04-21 14:07:19 +09:00
tmk
7613efca99 adb_usb: Fix for ISO swapped keys(issue #35) 2016-04-13 14:26:52 +09:00
Grant Rettke
0a0463aad2 Extenal -> External 2016-04-11 15:39:23 -05:00