1
0
Commit Graph

161 Commits

Author SHA1 Message Date
tmk
b9a1cd21e1 Merge branch 'nemith-master' 2016-09-24 11:35:34 +09:00
tmk
d356afb930 core: Fix OPT_DEFS for mbed build 2016-09-24 11:29:21 +09:00
leizzer
112cadb188 Merge branch 'master' of github.com:leizzer/tmk_keyboard 2016-09-22 01:40:53 -03:00
leizzer
d13a1d5076 Change .gitignore for ChibiOS
I changed the gitignore file to match the chibios.mk declaration.
Also it will be easier, you just clone ChibiOS and ChibiOS-Contrib and
you don't have to rename nothing.
2016-09-22 01:38:26 -03:00
tmk
1c1f7b14e3 core: Fix build config in protocol.mk 2016-09-16 11:47:12 +09:00
tmk
03007a59da core: Add short names in unimap 2016-09-09 11:24:44 +09:00
tmk
bd68c71e20 core: Fix dfu wait in rules.mk 2016-09-09 09:27:57 +09:00
tmk
e6d1975ea9 Merge branch 'mediakey-fix' 2016-09-08 14:45:35 +09:00
tmk
4703afac2f core: Fix 'make dfu' message 2016-09-08 14:45:12 +09:00
Travis La Marr
b2d791804d Fix OS X Recognizing keyboard as Mouse/Tablet
Modified the LUFA USB HID Descriptor to change the logical/usage
minimums for System Control from 0x01 (Mouse) to 0x81 (System Power
Down), this fixes OS X recognizing the Planck as having a mouse and
tablet, even with mousekeys off.
2016-09-08 14:35:21 +09:00
tmk
e5acff0312 core: 'make dfu' waits for bootloader to start
jackhumbert/qmk_firmware@0b8c448
2016-09-08 13:52:59 +09:00
tmk
384562bc8a core: Fix unimap UNIMAP_NO case 2016-09-08 13:18:05 +09:00
tmk
61cad24a87 core: Change lufa NKRO report size 16 to 32 bytes 2016-09-07 05:50:25 +09:00
tmk
765d82e8b1 core: Fix common.mk for build options 2016-08-31 16:40:32 +09:00
tmk
6bc7bab6a5 core: Fix unimap layout comment 2016-08-30 12:49:59 +09:00
tmk
e84a5981e3 core: Add unimap support 2016-08-29 13:54:44 +09:00
tmk
1b5266cb6e core: Fix doc/keymap.md for new keymap framework 2016-08-29 13:54:44 +09:00
tmk
19dca3def8 core: Add default implemenation of keymap read 2016-08-29 13:54:44 +09:00
tmk
e5cb8469af core: action codes are action_t struct now 2016-08-29 13:54:44 +09:00
tmk
9839bb83d9 core: Change chibios repo directory names 2016-08-08 13:35:11 +09:00
tmk
bd0f670345 core: Fix keycode.txt 2016-07-31 02:00:26 +09:00
tmk
a65fa6437c core: Fix USB remote wakeup on ATmega32U2 #361 2016-06-21 14:19:17 +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
tmk
7ce326dee5 core: Fix Logical Maximum in report descriptor 2016-06-08 05:17:47 +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
230ed4bdef core: change API of adb.c to accept device address 2016-06-04 19:27:16 +09:00
tmk
3fe8e1c238 Merge commit '20b787fc1284176834cbe7ca2134e4b36bec5828' 2016-05-22 22:49:29 +09:00
tmk
e661296200 core: Add comment of register 3 of ADB 2016-05-20 12:15:25 +09:00
tmk
d702fe7504 core: Add adb_host_talk() 2016-05-19 16:25:13 +09:00
esell
0c8c77450c update macro names in bluefruit 2016-05-05 12:50:05 -06:00
tmk
53bd4a01be Merge commit '71381457fa1311dfa0b58ba882a96db740640871'
Conflicts:
	tmk_core/doc/keymap.md
2016-04-21 14:37:16 +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
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
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
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
524c7d133c Merge commit '657d9f23fe47fb88cf221adb23095082f191ba6a' 2016-02-17 08:18:03 +09:00
flabbergast
803b65ea43 Chibios: Revert common.mk change (fix AVR linking problem). 2016-02-14 10:44:29 +00:00
tmk
83a3de38b7 Merge commit '5a0132f1c1c9a14fd2941f0a5e29bbf5e31da20c' into master-core-pull 2016-02-12 14:38:49 +09:00
flabbergast
fa52d8ba74 Chibios: cleanup usb_main code. 2016-02-11 21:14:28 +00:00
flabbergast
fdf808ee24 Chibios: Fix a HardFault bug (wait after start). 2016-02-11 21:12:29 +00:00