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
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
flabbergast
6def104530
ChibiOS/STM32: send remote wakeup.
2015-10-15 09:34:51 +01:00
flabbergast
2e06ccf70a
ChibiOS/kinetis: sending remote wakeup.
2015-10-14 19:55:09 +01:00
flabbergast
c1c8e079ca
Chibios: use WFI in idle. WIP suspend stuff.
2015-10-14 10:13:49 +01:00
flabbergast
2b4066bb93
Move chibios/cortex selection to local Makefiles.
2015-10-12 10:38:47 +01:00
flabbergast
9178ea2d73
Rename chibios example keyboard.
2015-10-12 10:20:16 +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
3c08375616
Fix chibios/usb_main GET_REPORT handing.
2015-10-12 06:52:26 +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
5ce9bf8353
Merge commit 'fdc38ef3f92af7adeeb4de49550d8838c8a39b5c'
2015-09-24 12:29:11 +09: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
bf3d4b3c06
lufa: Fix endpoint bank mode for ATMega32u2
2015-09-20 10:48:47 +09:00
tmk
9b99f8f864
next_usb: Fix next_kbd_set_leds()
2015-09-20 10:33:25 +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
flabbergast
438559f11d
Rename some Makefile defines.
2015-09-15 08:52:03 +01: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
flabbergast
9540016b12
Update chibios README.
2015-09-10 10:50:01 +01:00
flabbergast
dc9fc9a7a4
Add basic sleep_led for chibios.
2015-09-10 10:31:19 +01:00
flabbergast
7d4f3dd5a1
Move AVR specific sleep_led.c into avr.
2015-09-10 10:30:49 +01:00
flabbergast
5248511209
Fix bootloader-jump compiling.
2015-09-08 20:15:05 +01:00
flabbergast
9cc281b4ef
Small updates.
2015-09-08 19:22:00 +01:00
flabbergast
d057e5157e
Implement jump-to-bootloader.
2015-09-08 16:07:34 +01:00
flabbergast
8152d279a4
Move chibios to tool.
2015-09-08 16:06:33 +01:00
flabbergast
1d115301d4
Make usb_main more USB_DRIVER #define independent.
2015-09-08 15:35:02 +01:00
flabbergast
27dec2db7b
Add ChibiOS support (USB stack + support files).
2015-09-07 21:57:04 +01:00
flabbergast
be9be90483
Modularity and gcc warnings fixes.
2015-09-07 21:33:06 +01:00
