1
0
Commit Graph

1304 Commits

Author SHA1 Message Date
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
tmk
5a2a781fc9 next_usb: Stop debug print while no keyboard 2016-03-29 12:02:27 +09:00
tmk
e3994a620b x68k_usb: Change config for TMK converter 2016-03-29 12:02:27 +09:00
tmk
79afcd5570 Merge pull request #321 from njbair/master
Clarify and clean up wording in keymap.md, section 0
2016-03-29 07:48:45 +09:00
tmk
532e850751 hhkb: Add Makefile.rn42.jp 2016-03-29 07:10:17 +09:00
tmk
1414ea3531 hhkb: Fix name of consumer keys 2016-03-29 07:00:56 +09:00
tmk
24cee117d0 core: Fix media/consumer keys 2016-03-29 06:58:58 +09:00
Nick Bair
b17d2d176c Clean up wording in keymap example 2016-03-26 23:06:13 -04:00
Nick Bair
fd4d342568 Clarify layer precedence 2016-03-26 22:51:52 -04:00
Nick Bair
336a27e91d clarify layer documentation 2016-03-26 22:40:45 -04:00
tmk
6527e1d98a ps2_usb: Fix for VUSB configuration 2016-03-19 08:08:49 +09:00
tmk
882059c018 alps64: Use keymap as default instead of actionmap 2016-03-16 16:17:33 +09:00
tmk
3349b6a56d Merge branch 'actionmap' 2016-03-16 15:04:41 +09:00
tmk
81c3c1082a alps64: Fix keymap(plain and editor) 2016-03-12 07:49:06 +09:00
tmk
0ed5017640 alps64: Add actionmaps 2016-03-03 17:05:22 +09:00
Ethan Apodaca
a9bce90c60 Mostly working. Is unstable, will emit bad codes after a while. 2016-03-02 23:34:13 -08:00
tmk
5e9b21d77d core: Actionmap support 2016-03-03 16:18:19 +09:00
Ethan Apodaca
3def1c3065 Codes appear to be detected correctly, the break codes are broken. 2016-03-01 21:37:22 -08:00
tmk
75ca495c01 ibm4704_usb: Fix scan code range for Alps 102-key 2016-02-20 07:14:43 +09:00
tmk
449b31c18b mbed build workaround for #212 2016-02-19 14:40:33 +09:00
tmk
1d9c939f38 core: Fix chibios user compile options
Compile options can be defined in project Makefile such as UDEFS, UADEFS, UINCDIR, ULIBDIR and ULIBS.
2016-02-17 12:36:16 +09:00
tmk
a3f29c973d Merge branch 'chibios' of https://github.com/flabbergast/tmk_keyboard into flabbergast_chibios 2016-02-17 12:20:29 +09:00
tmk
6360eb308c core: Fix ps2_mouse.c debug print 2016-02-17 08:23:47 +09:00
obones
5a9953b46c Removed duplicate debug message code and surrounded it with IFDEF as needed 2016-02-17 08:18:46 +09:00
tmk
657d9f23fe Squashed 'tmk_core/' changes from 97c7ed4..ee8c5ba
ee8c5ba Remove warnings when NO_DEBUG is defined
a71e6e0 Remove warnings when NO_PRINT is defined

git-subtree-dir: tmk_core
git-subtree-split: ee8c5baecc9acf37976de36f56551fc9e6b92968
2016-02-17 08:18:03 +09:00