1
0
Commit Graph

1298 Commits

Author SHA1 Message Date
tmk
28203e909e Squashed 'tmk_core/' changes from 57d27a8..08ce4c3
08ce4c3 Add update for chibios in README
30cac1d Merge remote-tracking branch 'flabbergast-tmk_keyboard/chibios'
f218a38 core: Remove unused warning. Fix tmk_keyboard/#293
3e68807 Chibios: add more guards for transmitting (fix a deadlock bug).
cecc807 core: Speed up compilation
d01d959 Merge remote-tracking branch 'upstream/master' into chibios
8ff12ae Merge pull request #230 from jerryen/master
3afb83d core: Add note about sudo and git
2525d5d Chibios: Update to new USB API.
2fc5cd6 Merge branch 'master' into chibios
6f5511a core: Fix variable initialize
02a15fa core: Fix variable init and header include
1833ca1 Merge pull request #292 from obones/command_warning
bc9dc6f Merge pull request #294 from shayneholmes/fix-debug-message
c1b891b Merge pull request #295 from doopai/master
1da837c core: Add macro commands SM(), RM() and CM()
d9d5a93 Add support for storing, restoring and clearing modifiers in macros
4f371c0 core: Add dfu-programmer example to doc/build.md
ba3792e core: Fix doc/build.md
4b99fed remove  SERIAL_SOFT_DEBUG macro
984accb Fix typo in bootmagic debug message
67a7ea1 usb_usb: Fix for keymap editor
2fc9ae4 host_driver is only used if KEYBOARD_LOCK_ENABLE is defined
a35cdea Chibios: add 'core/protocol' to the makefiles' search path.
5ed2fd6 Merge remote-tracking branch 'upstream/master' into chibios
bbc4851 Do timeout when writing to CONSOLE EP queue.
2450559 Remove an errant comma trailing the KC_ERAS macro alias
8465747 Merge pull request #270 from jeffgran/single-tap-toggle
a37339a Merge pull request #271 from jeffgran/default-layer-toggle
8e732f7 core: Update doc/build.md and remove other_projects.md
e47dc15 Workaround for compiler warnings when console disabled.
4184c52 Add maple mini code.
b555238 core: Fix rules.mk for dfu target
26dacf4 add ACTION_DEFAULT_LAYER_TOGGLE to toggle a default layer on/off
83607d9 enable TAPPING_TOGGLE=1 to work correctly
bef3089 Merge branch 'master' into chibios
f7a55fd core: Fix debug print of usb_hid
1402f7d core: Add keycode KC_JPY for JIS
8e3a460 Chibios: Remove the wait in the main loop.
7d41746 ChibiOS: prettify/document sleep_led code.
235cdee ChibiOS: Update infinity bootloader code to match updated ChibiOS.
807bf1e Chibios: Add breathing sleep LED on Kinetis MCUs.
ba3bf7c ChibiOS: make reset request more CMSISy.
bf2ffd4 Add correct chibios/bootloader_jump for infinity KB.
f5e03fd Chibios/usb_main: rename a variable for clarity.
63a330c Fix drop key stroke
d8f5b06 Fix report size of boot protocol.
38abb50 ChibiOS/STM32: send remote wakeup.
6725650 ChibiOS/kinetis: sending remote wakeup.
69f6e54 Chibios: use WFI in idle. WIP suspend stuff.
02f044b Move chibios/cortex selection to local Makefiles.
fa59dfa Rename chibios example keyboard.
5c060de Add eeprom support for chibios/kinetis.
efd0044 Move declaration of keymap_config.
7196b24 Make bootmagic.c code portable (_delay_ms -> wait_ms).
37b15b2 Add missing #include to keymap.c.
31316e3 Merge branch 'master' into chibios
166f312 Fix chibios/usb_main GET_REPORT handing.
57ac6c2 Add ARM Teensies bootloader code.
1758086 Move STM32 bootloader address config to separate .h file.
03bb026 Rename some Makefile defines.
76ba6ac NKRO fixes.
06498f8 Update chibios README.
db0a4f5 Add basic sleep_led for chibios.
c3f930e Move AVR specific sleep_led.c into avr.
4069494 Fix bootloader-jump compiling.
9117f7b Small updates.
269cb85 Implement jump-to-bootloader.
7e81b34 Move chibios to tool.
923a892 Make usb_main more USB_DRIVER #define independent.
aa054f0 Add ChibiOS support (USB stack + support files).
1e3e282 Modularity and gcc warnings fixes.
2f60ce0 Add KEYBOARD_LOCK_ENABLE to makefile

git-subtree-dir: tmk_core
git-subtree-split: 08ce4c3021d2ecd446c5b9a137aded65423d241e
2016-02-11 12:21:21 +09:00
tmk
b47a88f4a5 Merge commit '28203e909e83b1ac6becb45a3eadae23b190df32' into master-core-pull 2016-02-11 12:21:21 +09:00
tmk
5b8e4ca2c4 Change README for chibios 2016-02-11 08:17:09 +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
99732d5acd ibm4704_usb: Fix README.md 2016-02-02 14:27:19 +09:00
tmk
3730666b97 ibm4704_usb: Add Makefiles for TMK Converter 2016-02-02 13:51:47 +09:00
tmk
5c89d73755 core: Remove unused warning. Fix tmk_keyboard/#293 2016-01-27 08:14:44 +09:00
tmk
e76c8cafea Merge pull request #299 from kairyu/speed-up-compilation
core: Speed up compilation
2016-01-24 10:16:43 +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
tmk
5611f94fb1 usb_usb: Change matrix size 32x8 to 16x16 2016-01-15 12:18:58 +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
47425d910b Merge branch 'usb_usb_editor' 2016-01-12 15:15:31 +09:00
tmk
6382a9b5f4 usb_usb: Fix for keymap editor 2016-01-12 15:13:26 +09:00
tmk
c5d98f5c6f hhkb: Add note about RN42 2016-01-12 11:31:07 +09:00
tmk
467602749d Fix fn_actions for keymap editor 2016-01-12 02:21:56 +09:00
tmk
7d621aca7b m0110_usb: Add LED flash on startup 2016-01-08 12:48:35 +09:00
tmk
c219570e54 adb_usb: Add LED flash on startup 2016-01-08 10:39:23 +09:00
tmk
310a39dd76 adb_usb: Change keycode PEQL to EQL(Fix #238)
Windows doesn't support PEQL(Keypad =)
2016-01-08 10:28:36 +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
1d6c6609e0 Chibios: Tsy LC is cortex-m0plus. 2015-12-27 19:32:27 +01:00
flabbergast
0998a9930d Chibios: update Teensy 3.x instructions. 2015-12-26 19:54:33 +01:00
flabbergast
b2a3a26537 Chibios: add makefiles for Teensy 3.x examples. 2015-12-21 17:04:46 +00:00
flabbergast
a47c3c7333 Chibios: rename example stm32_onekey -> stm32_f072_onekey. 2015-12-21 17:04:23 +00:00
flabbergast
dbbd4e8f8d Chibios: updates for 3.0.4 git. 2015-12-21 08:45:26 +00: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
tmk
33714e5582 Merge pull request #278 from uxp/keycode_syntax_fix
Remove an errant comma trailing the KC_ERAS macro alias
2015-12-09 10:44:27 +09:00
Howard P. Logsdon
3dd8fb4627 Remove an errant comma trailing the KC_ERAS macro alias 2015-12-08 16:46:08 -07:00
tmk
a5f289249b Merge branch 'master' of github.com:tmk/tmk_keyboard 2015-12-05 18:17:12 +09:00
tmk
6d144be8fd Merge pull request #270 from jeffgran/single-tap-toggle
enable TAPPING_TOGGLE=1 to work correctly
2015-12-05 18:15:10 +09:00
tmk
03ef2cf2d7 Merge branch 'jeffgran-single-tap-toggle' 2015-12-05 18:14:46 +09: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