di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity
1,086 Commits 3 Branches 4 Tags 47 MiB
3c109203c3
Commit Graph

128 Commits

Author SHA1 Message Date
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
tmk
5e9b21d77d core: Actionmap support 2016-03-03 16:18:19 +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
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
tmk
b47a88f4a5 Merge commit '28203e909e83b1ac6becb45a3eadae23b190df32' into master-core-pull 2016-02-11 12:21:21 +09:00
tmk
72b1668340 Merge remote-tracking branch 'flabbergast-tmk_keyboard/chibios' 
Merge flabbergast's chibios protocol into master
https://github.com/flabbergast/tmk_keyboard/tree/chibios
 2016-02-10 05:31:43 +09:00
tmk
5c89d73755 core: Remove unused warning. Fix tmk_keyboard/#293 2016-01-27 08:14:44 +09:00
flabbergast
72c52d30c8 Chibios: add more guards for transmitting (fix a deadlock bug). 2016-01-22 22:19:02 +00:00
Kai Ryu
42d5d64306 core: Speed up compilation 2016-01-22 10:47:10 +09:00
flabbergast
b1b30f1675 Merge remote-tracking branch 'upstream/master' into chibios 2016-01-18 07:36:39 +00:00
tmk
fb1fb122a5 Merge pull request #230 from jerryen/master 
Add KEYBOARD_LOCK_ENABLE to makefile
 2016-01-16 11:17:13 +09:00
tmk
5b820b9db8 core: Add note about sudo and git 2016-01-16 10:05:32 +09:00
flabbergast
5ef7d89406 Chibios: Update to new USB API. 2016-01-15 21:41:51 +00:00
flabbergast
ffbaeb7986 Merge branch 'master' into chibios 2016-01-15 17:11:46 +00:00
tmk
7694eb62ac core: Fix variable initialize 2016-01-15 16:26:01 +09:00
tmk
325a99acd9 core: Fix variable init and header include 2016-01-15 16:24:06 +09:00
tmk
b9edbb32e9 Merge pull request #292 from obones/command_warning 
Fix warning in command.c
 2016-01-15 16:07:14 +09:00
tmk
cfcf5b2734 Merge pull request #294 from shayneholmes/fix-debug-message 
Fix typo in bootmagic debug message
 2016-01-15 16:04:21 +09:00
tmk
c36828e25e Merge pull request #295 from doopai/master 
remove  SERIAL_SOFT_DEBUG macro
 2016-01-15 16:03:57 +09:00
tmk
8ccbbde881 core: Add macro commands SM(), RM() and CM() 2016-01-15 16:00:56 +09:00
Adrian L Lange
5a196b6444 Add support for storing, restoring and clearing modifiers in macros 2016-01-15 15:30:37 +09:00
tmk
6baca549b9 core: Add dfu-programmer example to doc/build.md 2016-01-15 14:30:47 +09:00
tmk
0851cf926f core: Fix doc/build.md 2016-01-15 14:14:10 +09:00
duanhongyi
c74eee6327 remove SERIAL_SOFT_DEBUG macro 
SERIAL_SOFT_DEBUG can be defined in the `config.h`
 2016-01-14 15:27:26 +08:00
Shayne Holmes
2a55b1d805 Fix typo in bootmagic debug message 2016-01-12 10:21:29 -08:00
tmk
6382a9b5f4 usb_usb: Fix for keymap editor 2016-01-12 15:13:26 +09:00
obones
66b6df0068 host_driver is only used if KEYBOARD_LOCK_ENABLE is defined 2016-01-07 14:40:53 +01:00
flabbergast
58867094c4 Chibios: add 'core/protocol' to the makefiles' search path. 2015-12-30 10:46:08 +01:00
flabbergast
8952d617ea Merge remote-tracking branch 'upstream/master' into chibios 2015-12-18 20:54:41 +00:00
flabbergast
a75834ee98 Do timeout when writing to CONSOLE EP queue. 
Fixes TMK bug #266.
 2015-12-18 20:50:59 +00:00
Howard P. Logsdon
3dd8fb4627 Remove an errant comma trailing the KC_ERAS macro alias 2015-12-08 16:46:08 -07:00
Jeff Gran
d60a9b9048 enable TAPPING_TOGGLE=1 to work correctly 
if TAPPING_TOGGLE is 1, then tap a single time should toggle the mods on/off each tap.

Previously this was broken, this fixes it. This allows the same key to either hold (momentary mod) or tap (toggle mod, like capslock).
 2015-12-05 18:11:21 +09:00
tmk
2d673dfabc Merge pull request #271 from jeffgran/default-layer-toggle 
add ACTION_DEFAULT_LAYER_TOGGLE to toggle a default layer on/off
 2015-12-05 14:21:40 +09:00
tmk
792327caac core: Update doc/build.md and remove other_projects.md 2015-12-05 13:38:37 +09:00
flabbergast
b110884a6d Workaround for compiler warnings when console disabled. 2015-12-03 09:05:09 +00:00
flabbergast
f108623011 Add maple mini code. 2015-12-03 08:49:55 +00:00
tmk
d0f174911e core: Fix rules.mk for dfu target 2015-11-27 07:19:19 +09:00