di0ib
5cff692d79
Merge remote-tracking branch 'refs/remotes/tmk/master'
2017-01-14 17:56:30 -10:00
tmk
74019c8e41
Merge commit '22b6e15a179031afb7c3534cf7b109b0668b602c'
2016-12-10 10:29:51 +09:00
di0ib
fe9e783ff7
Merge remote-tracking branch 'refs/remotes/tmk/master'
2016-12-06 19:32:50 -10:00
tmk
a88ad58342
core: Swap position of PEQL and PENT in unimap
2016-11-30 00:15:12 +09:00
Aldo Gunsing
54a1934607
core: Fix typo in definition AC_g
2016-11-14 23:30:06 +01:00
di0ib
61b54bd6ee
Merge remote-tracking branch 'refs/remotes/tmk/master'
2016-10-19 19:36:03 -10:00
tmk
ec06a3f9f5
core: Debug print for system and consumer keys
2016-10-18 14:34:47 +09:00
tmk
5969d6267f
core: Fix sleep_led
2016-10-12 14:35:53 +09:00
di0ib
757b054c44
Merge remote-tracking branch 'refs/remotes/tmk/master'
2016-10-08 00:03:46 -10:00
tmk
f57d834f13
core: Change matrix_init and matrix_print
2016-10-08 13:13:48 +09:00
tmk
f76a786b93
core: Add matrix_clear() and default impl.
2016-10-05 13:55:56 +09:00
tmk
8f969d6544
core: Add suspend mode options
2016-10-04 16:05:18 +09:00
tmk
9818d54d26
core: Fix suspend/wake for converters #386
2016-10-04 16:02:24 +09:00
tmk
8758035677
core: LUFA_DEBUG_SUART for serial debug
2016-10-03 13:10:53 +09:00
di0ib
8d7f811a80
Merge remote-tracking branch 'refs/remotes/tmk/master'
2016-10-02 12:15:09 -10:00
tmk
88c95615b9
core: Fix mechanical locking supoort #390
2016-09-26 08:51:45 +09:00
di0ib
fe97a8eba0
cleanup spacing
2016-09-17 08:22:27 -10:00
di0ib
37d06ecbb7
GNAP keyboard
...
GNAP dual controller dual matrix reactive LED
2016-09-16 20:25:48 -10:00
tmk
03007a59da
core: Add short names in unimap
2016-09-09 11:24:44 +09:00
tmk
384562bc8a
core: Fix unimap UNIMAP_NO case
2016-09-08 13:18:05 +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
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
148c6a5175
usb_usb: Add multiple keyboard support
...
it supports four keyboards and two cascaded hubs
2016-06-21 13:49:06 +09:00
tmk
3fe8e1c238
Merge commit '20b787fc1284176834cbe7ca2134e4b36bec5828'
2016-05-22 22:49:29 +09:00
tmk
53bd4a01be
Merge commit '71381457fa1311dfa0b58ba882a96db740640871'
...
Conflicts:
tmk_core/doc/keymap.md
2016-04-21 14:37:16 +09:00
tmk
24cee117d0
core: Fix media/consumer keys
2016-03-29 06:58:58 +09:00
tmk
5e9b21d77d
core: Actionmap support
2016-03-03 16:18:19 +09:00
tmk
524c7d133c
Merge commit '657d9f23fe47fb88cf221adb23095082f191ba6a'
2016-02-17 08:18:03 +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
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
Adrian L Lange
5a196b6444
Add support for storing, restoring and clearing modifiers in macros
2016-01-15 15:30:37 +09: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
8952d617ea
Merge remote-tracking branch 'upstream/master' into chibios
2015-12-18 20:54:41 +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
flabbergast
b110884a6d
Workaround for compiler warnings when console disabled.
2015-12-03 09:05:09 +00:00
Jeff Gran
681464c0f7
add ACTION_DEFAULT_LAYER_TOGGLE to toggle a default layer on/off
2015-11-26 00:57:07 -07:00
flabbergast
aa44c779ec
Merge branch 'master' into chibios
2015-11-23 15:51:59 +00:00
tmk
6cd178ced9
core: Add keycode KC_JPY for JIS
2015-11-18 14:07:19 +09:00
flabbergast
c60dd87918
ChibiOS: prettify/document sleep_led code.
2015-10-18 18:54:34 +01:00
flabbergast
d3f4b01d22
ChibiOS: Update infinity bootloader code to match updated ChibiOS.
2015-10-18 11:55:39 +01:00
