]>
git.friedersdorff.com Git - max/tmk_keyboard.git/log
tmk [Sat, 4 Jun 2016 14:36:20 +0000 (23:36 +0900)]
Merge branch 'adb_mediakey'
tmk [Sat, 4 Jun 2016 10:29:02 +0000 (19:29 +0900)]
adb_usb: Add support for Apple Adjustable keybaord media keys
tmk [Sat, 4 Jun 2016 10:02:41 +0000 (19:02 +0900)]
core: change API of adb.c to accept device address
tmk [Wed, 25 May 2016 01:25:32 +0000 (10:25 +0900)]
adb_usb: Fix swap ISO codes bug
tmk [Sun, 22 May 2016 13:49:29 +0000 (22:49 +0900)]
tmk [Sun, 22 May 2016 13:49:29 +0000 (22:49 +0900)]
Squashed 'tmk_core/' changes from
d5c5ac6 ..
8da1898
8da1898 Merge remote-tracking branch 'flabbergast/chibios'
f0fdd8a ChibiOS: update instructions.md.
24dd0b5 ChibiOS: update mk to match chibios/master.
cdee266 Merge branch 'develop' into chibios
221663c Fix signatre of layer state change hooks
5a364cb Merge branch 'hotfix-chibios' into develop
af664cd Merge branch 'newapi' into develop
04feeaa Clean hook codes
0ca106d Fix code and table in hook.txt
714d418 Add hook document from njbair's work
b715129 Chibios: add default location for chibios-contrib.
fb3a323 Merge branch 'master' into newapi
8b7fbbd Merge branch 'master' into develop
e49851a Chibios: add default location for chibios-contrib.
git-subtree-dir: tmk_core
git-subtree-split:
8da189851ba83b9bb46a4290cd76b7b7fef6134e
tmk [Sun, 22 May 2016 12:13:13 +0000 (21:13 +0900)]
Merge branch 'flabbergast-update'
flabbergast [Fri, 20 May 2016 21:45:03 +0000 (22:45 +0100)]
Chibios: update examples to current chibios git.
tmk [Fri, 20 May 2016 03:15:25 +0000 (12:15 +0900)]
core: Add comment of register 3 of ADB
tmk [Thu, 19 May 2016 18:32:11 +0000 (03:32 +0900)]
Merge branch 'adb_iso_fix'
tmk [Thu, 19 May 2016 18:30:46 +0000 (03:30 +0900)]
adb_usb: reinitialize for plug-in after startup
tmk [Thu, 19 May 2016 07:29:13 +0000 (16:29 +0900)]
Merge branch 'adb_iso_fix'
tmk [Thu, 19 May 2016 07:26:01 +0000 (16:26 +0900)]
adb_usb: autodetect ISO keyboards and swap codes
tmk [Thu, 19 May 2016 07:25:13 +0000 (16:25 +0900)]
core: Add adb_host_talk()
tmk [Mon, 16 May 2016 06:10:11 +0000 (15:10 +0900)]
Merge pull request #347 from omenlabs/master
John Hickey [Sat, 14 May 2016 21:29:05 +0000 (14:29 -0700)]
Make Bell and Click work on Sun Type 5c.
John Hickey [Tue, 10 May 2016 05:56:33 +0000 (22:56 -0700)]
Add hardware serial support for sun_usb converter
tmk [Thu, 5 May 2016 23:28:50 +0000 (08:28 +0900)]
Merge pull request #341 from esell/master
esell [Thu, 5 May 2016 18:50:59 +0000 (12:50 -0600)]
Merge pull request #1 from esell/bluefruit
esell [Thu, 5 May 2016 18:50:05 +0000 (12:50 -0600)]
update macro names in bluefruit
tmk [Fri, 29 Apr 2016 06:33:33 +0000 (15:33 +0900)]
x68k_usb: Add toggle LED sample
tmk [Fri, 29 Apr 2016 06:30:32 +0000 (15:30 +0900)]
x68k_usb: Convert legacy keymap into current one
tmk [Fri, 29 Apr 2016 05:54:52 +0000 (14:54 +0900)]
news_usb: Add TMK converter support
tmk [Thu, 21 Apr 2016 05:39:42 +0000 (14:39 +0900)]
Fix a link in README.md
tmk [Thu, 21 Apr 2016 05:37:59 +0000 (14:37 +0900)]
Merge branch 'master' of github.com:tmk/tmk_keyboard
tmk [Thu, 21 Apr 2016 05:37:16 +0000 (14:37 +0900)]
Merge commit '
71381457fa1311dfa0b58ba882a96db740640871 '
Conflicts:
tmk_core/doc/keymap.md
tmk [Thu, 21 Apr 2016 05:35:48 +0000 (14:35 +0900)]
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
tmk [Thu, 21 Apr 2016 05:07:19 +0000 (14:07 +0900)]
Merge pull request #327 from grettke/patch-1
tmk [Wed, 13 Apr 2016 05:26:52 +0000 (14:26 +0900)]
adb_usb: Fix for ISO swapped keys(issue #35)
Grant Rettke [Mon, 11 Apr 2016 20:39:23 +0000 (15:39 -0500)]
Extenal -> External
tmk [Tue, 29 Mar 2016 02:15:09 +0000 (11:15 +0900)]
next_usb: Stop debug print while no keyboard
tmk [Tue, 29 Mar 2016 01:52:25 +0000 (10:52 +0900)]
x68k_usb: Change config for TMK converter
tmk [Mon, 28 Mar 2016 22:48:45 +0000 (07:48 +0900)]
Merge pull request #321 from njbair/master
tmk [Mon, 28 Mar 2016 22:10:17 +0000 (07:10 +0900)]
hhkb: Add Makefile.rn42.jp
tmk [Mon, 28 Mar 2016 22:00:56 +0000 (07:00 +0900)]
hhkb: Fix name of consumer keys
tmk [Mon, 28 Mar 2016 21:58:58 +0000 (06:58 +0900)]
core: Fix media/consumer keys
Nick Bair [Sun, 27 Mar 2016 03:06:13 +0000 (23:06 -0400)]
Clean up wording in keymap example
Nick Bair [Sun, 27 Mar 2016 02:51:52 +0000 (22:51 -0400)]
Clarify layer precedence
Nick Bair [Sun, 27 Mar 2016 02:40:45 +0000 (22:40 -0400)]
clarify layer documentation
tmk [Fri, 18 Mar 2016 23:08:49 +0000 (08:08 +0900)]
ps2_usb: Fix for VUSB configuration
tmk [Wed, 16 Mar 2016 07:17:33 +0000 (16:17 +0900)]
alps64: Use keymap as default instead of actionmap
tmk [Wed, 16 Mar 2016 06:04:41 +0000 (15:04 +0900)]
Merge branch 'actionmap'
tmk [Fri, 11 Mar 2016 22:49:06 +0000 (07:49 +0900)]
alps64: Fix keymap(plain and editor)
tmk [Thu, 3 Mar 2016 08:05:22 +0000 (17:05 +0900)]
alps64: Add actionmaps
tmk [Thu, 3 Mar 2016 07:18:19 +0000 (16:18 +0900)]
core: Actionmap support
tmk [Fri, 19 Feb 2016 22:14:43 +0000 (07:14 +0900)]
ibm4704_usb: Fix scan code range for Alps 102-key
tmk [Fri, 19 Feb 2016 05:40:33 +0000 (14:40 +0900)]
mbed build workaround for #212
tmk [Wed, 17 Feb 2016 03:36:16 +0000 (12:36 +0900)]
core: Fix chibios user compile options
tmk [Wed, 17 Feb 2016 03:20:29 +0000 (12:20 +0900)]
Merge branch 'chibios' of https://github.com/flabbergast/tmk_keyboard into flabbergast_chibios
tmk [Tue, 16 Feb 2016 23:23:47 +0000 (08:23 +0900)]
core: Fix ps2_mouse.c debug print
obones [Wed, 10 Feb 2016 10:18:50 +0000 (11:18 +0100)]
Removed duplicate debug message code and surrounded it with IFDEF as needed
tmk [Tue, 16 Feb 2016 23:18:03 +0000 (08:18 +0900)]
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
tmk [Tue, 16 Feb 2016 23:18:03 +0000 (08:18 +0900)]
flabbergast [Sat, 13 Feb 2016 10:01:16 +0000 (10:01 +0000)]
Chibios: Revert common.mk change (fix AVR linking problem).
tmk [Fri, 12 Feb 2016 05:38:49 +0000 (14:38 +0900)]
Squashed 'tmk_core/' changes from
08ce4c3 ..
97c7ed4
97c7ed4 Fix COMMON_DIR in common.mk.
git-subtree-dir: tmk_core
git-subtree-split:
97c7ed4de60ec73de7b5af7c0d66041c523d037a
tmk [Fri, 12 Feb 2016 05:38:49 +0000 (14:38 +0900)]
flabbergast [Thu, 11 Feb 2016 21:14:28 +0000 (21:14 +0000)]
Chibios: cleanup usb_main code.
flabbergast [Thu, 11 Feb 2016 21:12:19 +0000 (21:12 +0000)]
Chibios: Fix a HardFault bug (wait after start).
tmk [Thu, 11 Feb 2016 03:21:21 +0000 (12:21 +0900)]
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
tmk [Thu, 11 Feb 2016 03:21:21 +0000 (12:21 +0900)]
tmk [Tue, 9 Feb 2016 23:11:45 +0000 (08:11 +0900)]
Change README for chibios
tmk [Tue, 9 Feb 2016 20:31:43 +0000 (05:31 +0900)]
Merge remote-tracking branch 'flabbergast-tmk_keyboard/chibios'
tmk [Tue, 2 Feb 2016 05:27:19 +0000 (14:27 +0900)]
ibm4704_usb: Fix README.md
tmk [Tue, 2 Feb 2016 04:51:47 +0000 (13:51 +0900)]
ibm4704_usb: Add Makefiles for TMK Converter
tmk [Tue, 26 Jan 2016 23:14:44 +0000 (08:14 +0900)]
core: Remove unused warning. Fix tmk_keyboard/#293
tmk [Sun, 24 Jan 2016 01:16:43 +0000 (10:16 +0900)]
Merge pull request #299 from kairyu/speed-up-compilation
flabbergast [Fri, 22 Jan 2016 22:19:02 +0000 (22:19 +0000)]
Chibios: add more guards for transmitting (fix a deadlock bug).
Kai Ryu [Fri, 22 Jan 2016 01:21:51 +0000 (10:21 +0900)]
core: Speed up compilation
flabbergast [Mon, 18 Jan 2016 07:36:39 +0000 (07:36 +0000)]
Merge remote-tracking branch 'upstream/master' into chibios
tmk [Sat, 16 Jan 2016 02:17:13 +0000 (11:17 +0900)]
Merge pull request #230 from jerryen/master
tmk [Sat, 16 Jan 2016 01:05:32 +0000 (10:05 +0900)]
core: Add note about sudo and git
flabbergast [Fri, 15 Jan 2016 21:41:51 +0000 (21:41 +0000)]
Chibios: Update to new USB API.
flabbergast [Fri, 15 Jan 2016 17:11:46 +0000 (17:11 +0000)]
Merge branch 'master' into chibios
tmk [Fri, 15 Jan 2016 07:26:01 +0000 (16:26 +0900)]
core: Fix variable initialize
tmk [Fri, 15 Jan 2016 07:24:06 +0000 (16:24 +0900)]
core: Fix variable init and header include
tmk [Fri, 15 Jan 2016 07:07:14 +0000 (16:07 +0900)]
Merge pull request #292 from obones/command_warning
tmk [Fri, 15 Jan 2016 07:04:21 +0000 (16:04 +0900)]
Merge pull request #294 from shayneholmes/fix-debug-message
tmk [Fri, 15 Jan 2016 07:03:57 +0000 (16:03 +0900)]
Merge pull request #295 from doopai/master
tmk [Fri, 15 Jan 2016 07:00:56 +0000 (16:00 +0900)]
core: Add macro commands SM(), RM() and CM()
Adrian L Lange [Fri, 23 Oct 2015 18:38:50 +0000 (20:38 +0200)]
Add support for storing, restoring and clearing modifiers in macros
tmk [Fri, 15 Jan 2016 05:30:47 +0000 (14:30 +0900)]
core: Add dfu-programmer example to doc/build.md
tmk [Fri, 15 Jan 2016 05:12:57 +0000 (14:12 +0900)]
core: Fix doc/build.md
tmk [Fri, 15 Jan 2016 03:18:58 +0000 (12:18 +0900)]
usb_usb: Change matrix size 32x8 to 16x16
duanhongyi [Thu, 14 Jan 2016 07:27:26 +0000 (15:27 +0800)]
remove SERIAL_SOFT_DEBUG macro
Shayne Holmes [Tue, 12 Jan 2016 18:19:58 +0000 (10:19 -0800)]
Fix typo in bootmagic debug message
tmk [Tue, 12 Jan 2016 06:15:31 +0000 (15:15 +0900)]
Merge branch 'usb_usb_editor'
tmk [Tue, 12 Jan 2016 04:03:22 +0000 (13:03 +0900)]
usb_usb: Fix for keymap editor
tmk [Tue, 12 Jan 2016 02:31:07 +0000 (11:31 +0900)]
hhkb: Add note about RN42
tmk [Mon, 11 Jan 2016 17:21:56 +0000 (02:21 +0900)]
Fix fn_actions for keymap editor
tmk [Fri, 8 Jan 2016 03:48:35 +0000 (12:48 +0900)]
m0110_usb: Add LED flash on startup
tmk [Fri, 8 Jan 2016 01:39:23 +0000 (10:39 +0900)]
adb_usb: Add LED flash on startup
tmk [Fri, 8 Jan 2016 01:25:24 +0000 (10:25 +0900)]
adb_usb: Change keycode PEQL to EQL(Fix #238)
obones [Thu, 7 Jan 2016 13:40:53 +0000 (14:40 +0100)]
host_driver is only used if KEYBOARD_LOCK_ENABLE is defined
flabbergast [Wed, 30 Dec 2015 09:46:08 +0000 (10:46 +0100)]
Chibios: add 'core/protocol' to the makefiles' search path.
flabbergast [Sun, 27 Dec 2015 18:32:27 +0000 (19:32 +0100)]
Chibios: Tsy LC is cortex-m0plus.
flabbergast [Sat, 26 Dec 2015 18:54:33 +0000 (19:54 +0100)]
Chibios: update Teensy 3.x instructions.
flabbergast [Mon, 21 Dec 2015 17:04:46 +0000 (17:04 +0000)]
Chibios: add makefiles for Teensy 3.x examples.
flabbergast [Mon, 21 Dec 2015 17:04:23 +0000 (17:04 +0000)]
Chibios: rename example stm32_onekey -> stm32_f072_onekey.
flabbergast [Mon, 21 Dec 2015 08:45:26 +0000 (08:45 +0000)]
Chibios: updates for 3.0.4 git.
flabbergast [Fri, 18 Dec 2015 20:54:41 +0000 (20:54 +0000)]
Merge remote-tracking branch 'upstream/master' into chibios
projects / max / tmk_keyboard.git / log