1
0
Commit Graph

1185 Commits

Author SHA1 Message Date
tmk
d4982a21ac Fix a link in README.md 2016-04-21 14:39:42 +09:00
tmk
b1d691bcfd Merge branch 'master' of github.com:tmk/tmk_keyboard 2016-04-21 14:37:59 +09:00
tmk
53bd4a01be Merge commit '71381457fa1311dfa0b58ba882a96db740640871'
Conflicts:
	tmk_core/doc/keymap.md
2016-04-21 14:37:16 +09:00
tmk
71381457fa Squashed 'tmk_core/' changes from ee8c5ba..d5c5ac6
d5c5ac6 Merge branch 'develop'
5957682 Merge branch 'hotfix-mediakey'
a478c62 Merge branch 'hotfix-vusb'
cccebfe Merge branch 'njbair-docfix'
0aaab57 Clean up wording in keymap example
dc8bbc3 Clarify layer precedence
9e0b4c1 clarify layer documentation
915eb48 core: Fix media/consumer keys
88f90f3 Fix for VUSB configuration
3e290cd Fix including board.mk in chibios.mk
32c69e0 Merge branch 'newapi' into develop
c9a56f9 Merge remote-tracking branch 'flabbergast/chibios' into develop
01e33ea Fix chibios and mbed common.mk for hook.c
bea79d9 hook: Change func name of usb events
3e97536 hook: Change file and func names(*_hook -> hook_*)
c286d8c Merge pull request #10 from fredizzimo/chibios-contrib2
062d74e Update ChibiOS instructions
d47150f Add support for new version of ChibiOS and Contrib
62b5401 Chibios: disable LTO (link-time optimisation).
c64e9aa hooks: Fix for LUFA
54e68b0 hooks: Remove led_restore_hook
325c09d Chibios: make the default bootloader_jump redefinable (weak).
078c722 Chibios: fix STM32_BOOTLOADER_ADDRESS name.
e73cfe5 hooks: Fix for keyboard LED update
e6120c5 Implement basic hooks.
7c370e9 Chibios: Update the main chibios README.
7f0198d Chibios: implement sleep LED for STM32.
afef9b4 Fix hard-coded path of CHIBIOS
95c5b19 Merge pull request #7 from fredizzimo/sysvsize
27128a8 Sysv format for ChibiOS arm-none-eabi-size
d4b8e68 core: Fix chibios user compile options
b85d462 Merge branch 'chibios' of https://github.com/flabbergast/tmk_keyboard into flabbergast_chibios
de41aa1 core: Fix ps2_mouse.c debug print
d79d925 Removed duplicate debug message code and surrounded it with IFDEF as needed
8f28589 Chibios: Revert common.mk change (fix AVR linking problem).
ec9eff2 Chibios: cleanup usb_main code.
28c4665 Chibios: Fix a HardFault bug (wait after start).

git-subtree-dir: tmk_core
git-subtree-split: d5c5ac63e60dfc6da6661a21bd968b4d577a27d5
2016-04-21 14:35:48 +09:00
tmk
38931d604f Merge pull request #327 from grettke/patch-1
Extenal -> External
2016-04-21 14:07:19 +09:00
tmk
7613efca99 adb_usb: Fix for ISO swapped keys(issue #35) 2016-04-13 14:26:52 +09:00
Grant Rettke
0a0463aad2 Extenal -> External 2016-04-11 15:39:23 -05:00
tmk
5a2a781fc9 next_usb: Stop debug print while no keyboard 2016-03-29 12:02:27 +09:00
tmk
e3994a620b x68k_usb: Change config for TMK converter 2016-03-29 12:02:27 +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
532e850751 hhkb: Add Makefile.rn42.jp 2016-03-29 07:10:17 +09:00
tmk
1414ea3531 hhkb: Fix name of consumer keys 2016-03-29 07:00:56 +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
tmk
882059c018 alps64: Use keymap as default instead of actionmap 2016-03-16 16:17:33 +09:00
tmk
3349b6a56d Merge branch 'actionmap' 2016-03-16 15:04:41 +09:00
tmk
81c3c1082a alps64: Fix keymap(plain and editor) 2016-03-12 07:49:06 +09:00
tmk
0ed5017640 alps64: Add actionmaps 2016-03-03 17:05:22 +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
75ca495c01 ibm4704_usb: Fix scan code range for Alps 102-key 2016-02-20 07:14:43 +09:00
tmk
449b31c18b mbed build workaround for #212 2016-02-19 14:40:33 +09: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
657d9f23fe Squashed 'tmk_core/' changes from 97c7ed4..ee8c5ba
ee8c5ba Remove warnings when NO_DEBUG is defined
a71e6e0 Remove warnings when NO_PRINT is defined

git-subtree-dir: tmk_core
git-subtree-split: ee8c5baecc9acf37976de36f56551fc9e6b92968
2016-02-17 08:18:03 +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
5a0132f1c1 Squashed 'tmk_core/' changes from 08ce4c3..97c7ed4
97c7ed4 Fix COMMON_DIR in common.mk.

git-subtree-dir: tmk_core
git-subtree-split: 97c7ed4de60ec73de7b5af7c0d66041c523d037a
2016-02-12 14:38:49 +09: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
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