1
0
Commit Graph

67 Commits

Author SHA1 Message Date
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
flabbergast
aef7a2973e Chibios: Add breathing sleep LED on Kinetis MCUs. 2015-10-18 11:37:27 +01:00
flabbergast
44421f5bf4 ChibiOS: make reset request more CMSISy. 2015-10-18 10:44:08 +01:00
flabbergast
0914c58351 Add correct chibios/bootloader_jump for infinity KB. 2015-10-17 18:20:12 +01:00
flabbergast
c1c8e079ca Chibios: use WFI in idle. WIP suspend stuff. 2015-10-14 10:13:49 +01:00
flabbergast
2ac5cd730b Add eeprom support for chibios/kinetis. 2015-10-12 09:47:27 +01:00
flabbergast
cb663eeca6 Move declaration of keymap_config.
Should really not declare variables in .h files - since it's included
in different .c files, a proper linker then complains that the same
variable is declared more than once (once for each .c file that the
offending .h is included in).
2015-10-12 09:46:48 +01:00
flabbergast
d9652cdf99 Make bootmagic.c code portable (_delay_ms -> wait_ms). 2015-10-12 09:40:06 +01:00
flabbergast
cd7f30299a Add missing #include to keymap.c. 2015-10-12 07:14:07 +01:00
flabbergast
b388269407 Merge branch 'master' into chibios 2015-10-12 06:55:37 +01:00
flabbergast
19bb28d102 Add ARM Teensies bootloader code. 2015-10-10 15:20:55 +01:00
flabbergast
88c053f78e Move STM32 bootloader address config to separate .h file. 2015-10-05 10:23:31 +01:00
Jun Wako
77afc5a76f core: Fix NKRO ifdef 2015-09-24 01:35:10 +09:00
tmk
ed9766a7d4 core: Fix for disabling NKRO in Boot protocol 2015-09-20 14:34:13 +09:00
tmk
e8a4a63ec4 core: Fix message print of debug command 2015-09-20 10:51:30 +09:00
tmk
498654fc4c Change to KC_BOOTLOADER(KC_BTLD) 2015-09-16 13:01:06 +09:00
skullY
bb8c1d29fa Add an assignable RESET key 2015-09-16 12:35:21 +09:00
tmk
a8d4daa761 Fix parenthesis 2015-09-12 11:26:37 +09:00
tmk
0c21b263f9 Fix weak modifier clear in action macro 2015-09-12 11:25:41 +09:00
flabbergast
a24ddf3403 NKRO fixes. 2015-09-10 12:48:44 +01:00