Commit Graph

232 Commits (53f7770217715f75d266bf222c00a45695abacb2)

Author SHA1 Message Date
tmk 44fc56a869 core: Fix for missing key on fc660c 2017-04-11 04:36:38 +09:00
tmk 300628e5dc core: Add MOD_NONE to mods_bit enum 2017-02-03 08:54:17 +09:00
tmk c0f0909051 core: Fix LAYER_MODS() and LAYER_TAP()
- LAYER_MODS() accepts either left or right modifiers
- LAYER_TAP() can use modifier as tap key, related to #422
2017-01-11 10:30:47 +09:00
tmk be80ed2ef3 core: Cancel removing IS_ANY() at c98e89f
IS_ANY() is used in usb_usb
2017-01-05 21:17:29 +09:00
tmk c98e89f2d5 core: Modifiers can be used as tap key Fix #422 2017-01-04 12:51:13 +09:00
tmk d5689296ab core: Fix for ChibiOS update #411 2016-12-20 15:16:34 +09:00
tmk 74019c8e41 Merge commit '22b6e15a179031afb7c3534cf7b109b0668b602c' 2016-12-10 10:29:51 +09:00
Anthony a499c19cd0 Add note for L/R side bit being ignored 2016-12-04 16:46:43 +11:00
Anthony a6a6d4ab49 Add in basic documentation for Macro system 2016-12-04 16:46:42 +11:00
tmk a88ad58342 core: Swap position of PEQL and PENT in unimap 2016-11-30 00:15:12 +09:00
tmk a6f725d2bc Merge pull request #406 from 39aldo39/patch-1
core: Fix typo in definition AC_g
2016-11-29 22:53:31 +09:00
Luiz Ribeiro 391c979be7 V-USB remote wakeup 2016-11-27 15:33:42 -05:00
Aldo Gunsing 54a1934607 core: Fix typo in definition AC_g 2016-11-14 23:30:06 +01: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
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
tmk 88c95615b9 core: Fix mechanical locking supoort #390 2016-09-26 08:51:45 +09:00
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
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