Commit Graph

115 Commits (6360eb308c4b81d5effde77e9b0f357dd9673696)

Author SHA1 Message Date
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
tmk 83a3de38b7 Merge commit '5a0132f1c1c9a14fd2941f0a5e29bbf5e31da20c' into master-core-pull 2016-02-12 14:38:49 +09: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
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 e5bad3f3b7 core: Fix debug print of usb_hid 2015-11-18 14:18:59 +09:00
tmk 6cd178ced9 core: Add keycode KC_JPY for JIS 2015-11-18 14:07:19 +09:00
flabbergast 41f5be3b7a Chibios: Remove the wait in the main loop. 2015-11-14 09:20:55 +00: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 7c4a2fab6d Chibios/usb_main: rename a variable for clarity. 2015-10-17 18:18:47 +01:00
Jun Wako 8bcddd24f7 Fix drop key stroke
Keyboard report should be checked if its transfer finishs successfully.
Otherwise key stroke can be missing when other key event occurs
before the last report transfer is done.

Boot protocol 10ms interval probably causes this problem in case
it receives key events in a row within the period. NKRO protocol
suffers less or nothing due to its interval 1ms.
2015-10-17 15:28:21 +09:00
Jun Wako 1c5c9d94c8 Fix report size of boot protocol. 2015-10-17 01:59:55 +09:00