]>
git.friedersdorff.com Git - max/tmk_keyboard.git/log
Oleg Kostyuk [Tue, 10 Feb 2015 00:22:26 +0000 (02:22 +0200)]
Merge remote-tracking branch 'tmk/master'
Conflicts:
README.md
Jun Wako [Mon, 26 Jan 2015 02:25:22 +0000 (11:25 +0900)]
Fix call parameter of suspend_power_down()
tmk [Sun, 25 Jan 2015 13:02:34 +0000 (22:02 +0900)]
Merge pull request #176 from xauser/forhasu
NerD bugfix
Ralf Schmitt [Tue, 20 Jan 2015 19:18:33 +0000 (20:18 +0100)]
Kitten Paw, fix main README link to project.
Ralf Schmitt [Mon, 19 Jan 2015 19:10:49 +0000 (20:10 +0100)]
NerD, turn BRK into PAUS to get bootloader jump back.
tmk [Mon, 19 Jan 2015 03:43:30 +0000 (12:43 +0900)]
Add external projects using tmk_keyboard
tmk [Mon, 19 Jan 2015 03:13:21 +0000 (12:13 +0900)]
Merge pull request #148 from cub-uanic/patch-1
Fix keycode.txt
tmk [Mon, 19 Jan 2015 02:58:04 +0000 (11:58 +0900)]
Merge pull request #151 from bswinnerton/typo-fix
Fixing typo in console mode
tmk [Mon, 19 Jan 2015 02:18:43 +0000 (11:18 +0900)]
Merge branch 'vovcacik-ghost_squid'
tmk [Mon, 19 Jan 2015 02:17:05 +0000 (11:17 +0900)]
Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid
Conflicts:
README.md
tmk [Mon, 19 Jan 2015 02:08:05 +0000 (11:08 +0900)]
Merge pull request #164 from cub-uanic/patch-2
Update other_projects.md - added TMK/Ergodox
tmk [Mon, 19 Jan 2015 01:35:06 +0000 (10:35 +0900)]
Fix typo 'keyobard' #166
tmk [Mon, 19 Jan 2015 01:21:01 +0000 (10:21 +0900)]
Merge branch 'xauser-forhasu'
tmk [Mon, 19 Jan 2015 01:20:20 +0000 (10:20 +0900)]
Revert "Changed hotkey for bootloader jump"
This reverts commit
f31cbc7219c9a1903331771c10056302817e68ca.
tmk [Mon, 19 Jan 2015 01:19:47 +0000 (10:19 +0900)]
Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-forhasu
tmk [Sat, 17 Jan 2015 06:34:33 +0000 (15:34 +0900)]
hhkb: Update RN-42 docs
Ralf Schmitt [Sun, 14 Dec 2014 11:15:17 +0000 (12:15 +0100)]
Added missing keyboards to main README
Ralf Schmitt [Sun, 23 Nov 2014 12:29:07 +0000 (13:29 +0100)]
Added NerD 80% (TKL) support
Ralf Schmitt [Tue, 11 Nov 2014 13:49:16 +0000 (14:49 +0100)]
Added NerD 60% support
Ralf Schmitt [Wed, 12 Nov 2014 13:05:57 +0000 (14:05 +0100)]
Changed hotkey for bootloader jump
tmk [Fri, 16 Jan 2015 02:51:34 +0000 (11:51 +0900)]
Merge branch 'rn42_integrate'
tmk [Fri, 16 Jan 2015 01:21:18 +0000 (10:21 +0900)]
hhkb: Integrate RN-42 support, remove hhkb_rn42
tmk [Thu, 15 Jan 2015 23:26:59 +0000 (08:26 +0900)]
hhkb_rn42: Move doc
tmk [Thu, 15 Jan 2015 20:22:29 +0000 (05:22 +0900)]
hhkb: Fix layer stuck of keymap_hasu
- In mouse key layer with holding semicolon, press Fn0, release
semicolon and release Fn0 now layer 1 is stuck.
tmk [Thu, 15 Jan 2015 08:12:26 +0000 (17:12 +0900)]
Merge branch 'rn42'
tmk [Thu, 15 Jan 2015 08:02:38 +0000 (17:02 +0900)]
rn42: Update doc
tmk [Sun, 11 Jan 2015 19:35:00 +0000 (04:35 +0900)]
Use pgmspace for RN-42 commands
tmk [Sun, 11 Jan 2015 19:32:53 +0000 (04:32 +0900)]
Increase buffer of rn42_gets() and change rn42_linked()
tmk [Sat, 10 Jan 2015 22:00:41 +0000 (07:00 +0900)]
rn42: Add commands for RN-42
tmk [Sat, 10 Jan 2015 17:39:32 +0000 (02:39 +0900)]
rn42: Add rn42_getc and rn42_gets
tmk [Mon, 5 Jan 2015 18:22:41 +0000 (03:22 +0900)]
Fxi layer stuck of keymap_hasu
- In mouse key layer with holding semicolon, press Fn0, release
semicolon and release Fn0 now layer 1 is stuck.
tmk [Thu, 11 Dec 2014 23:25:16 +0000 (08:25 +0900)]
Update doc
tmk [Mon, 8 Dec 2014 03:22:33 +0000 (12:22 +0900)]
Change RN42 state display
tmk [Wed, 3 Dec 2014 06:50:02 +0000 (15:50 +0900)]
Fix power saving while USB suspended
- doesn't pwoer save while Bluetooth turns on
tmk [Wed, 3 Dec 2014 05:22:10 +0000 (14:22 +0900)]
Add wait for charging capacitance of ADC S/H
tmk [Tue, 2 Dec 2014 17:17:54 +0000 (02:17 +0900)]
Fix: enable digital input for PF5
tmk [Tue, 2 Dec 2014 17:08:27 +0000 (02:08 +0900)]
Clean ADC code of battery_voltage()
tmk [Tue, 2 Dec 2014 13:47:59 +0000 (22:47 +0900)]
Disable input buffer for ADC
tmk [Sat, 29 Nov 2014 12:14:00 +0000 (21:14 +0900)]
Update MEMO
tmk [Sat, 29 Nov 2014 12:12:47 +0000 (21:12 +0900)]
Add LUFA device state to command info
tmk [Sat, 29 Nov 2014 11:47:15 +0000 (20:47 +0900)]
Fix lufa sendchar() infinite wait loop
- FrameNumber is not updated when adapter powered
- can be blocked in sendchar() when pluged into AC adapter
tmk [Wed, 26 Nov 2014 02:42:53 +0000 (11:42 +0900)]
Fix USB plug-in while BT mode falls to be enumerated
tmk [Wed, 26 Nov 2014 02:25:45 +0000 (11:25 +0900)]
Compensate timer during prower down
Jun Wako [Sat, 10 Jan 2015 16:54:17 +0000 (01:54 +0900)]
hhkb: Add Makefile.jp for HHKB JP
Jun Wako [Sun, 4 Jan 2015 08:22:06 +0000 (17:22 +0900)]
Merge branch 'mbed_infinity'
Jun Wako [Sun, 4 Jan 2015 08:03:47 +0000 (17:03 +0900)]
infinity: Add initial files for keyboard support
Jun Wako [Sat, 3 Jan 2015 18:27:24 +0000 (03:27 +0900)]
infinity: Move project specific files to local
Jun Wako [Sat, 3 Jan 2015 11:21:23 +0000 (20:21 +0900)]
Fix linker script for NVIC vector on RAM
Jun Wako [Fri, 2 Jan 2015 14:19:26 +0000 (23:19 +0900)]
Add openocd config files for K20
Jun Wako [Fri, 2 Jan 2015 12:16:40 +0000 (21:16 +0900)]
Add keyboard/infinity
Jun Wako [Sun, 14 Dec 2014 06:52:33 +0000 (15:52 +0900)]
Fix ps2 protocol build using ps2_io.h
Jun Wako [Sun, 14 Dec 2014 04:59:22 +0000 (13:59 +0900)]
Update makefiles to mbed-sdk
14666bb
Jun Wako [Fri, 12 Dec 2014 05:05:05 +0000 (14:05 +0900)]
Ad hoc fix of print and debug for mbed
Oleg Kostyuk [Sun, 4 Jan 2015 03:42:29 +0000 (05:42 +0200)]
Updates to Ergodox-FAQ.md
Oleg Kostyuk [Sat, 3 Jan 2015 13:36:29 +0000 (15:36 +0200)]
Updates to local gitignore
Oleg Kostyuk [Sat, 3 Jan 2015 12:39:23 +0000 (14:39 +0200)]
Updates to Ergodox-FAQ.md
Oleg Kostyuk [Sat, 3 Jan 2015 13:10:45 +0000 (15:10 +0200)]
Update other_projects.md - added TMK/Ergodox
Oleg Kostyuk [Sat, 3 Jan 2015 11:55:49 +0000 (13:55 +0200)]
Include $(TOP_DIR)/protocol.mk
tmk [Sat, 3 Jan 2015 03:02:48 +0000 (12:02 +0900)]
bluefruit, pjrc: Update protocols for new API
Oleg Kostyuk [Fri, 2 Jan 2015 22:12:17 +0000 (00:12 +0200)]
Change key_t to keypos_t - follow Hasu's style
Oleg Kostyuk [Fri, 2 Jan 2015 21:55:55 +0000 (23:55 +0200)]
Merge remote-tracking branch 'tmk/master' into cub_layout
tmk [Thu, 1 Jan 2015 03:17:11 +0000 (12:17 +0900)]
Fix modifier stuck of Lock command(#127)
Jun Wako [Tue, 30 Dec 2014 04:52:53 +0000 (13:52 +0900)]
usb_usb: update README
Vlastimil Ovčáčík [Sun, 28 Dec 2014 08:49:57 +0000 (09:49 +0100)]
Added support for The Ghost Squid controller used for CM XT keyboard.
- initial commit
- created as clone of the kitten_paw subproject with pins adjusted for CM
XT
Jun Wako [Fri, 26 Dec 2014 04:29:23 +0000 (13:29 +0900)]
Merge branch 'mumchristmas-Apple_media_key_fix' #160
Jun Wako [Fri, 26 Dec 2014 04:27:06 +0000 (13:27 +0900)]
Remove unwanted white space
Colt Ma [Fri, 26 Dec 2014 03:02:25 +0000 (11:02 +0800)]
Add keycode for Fast Forward & Rewind
KC_MEDIA_FAST_FORWARD
KC_MEDIA_REWIND
tmk [Wed, 24 Dec 2014 02:11:07 +0000 (11:11 +0900)]
[ps2,terminal_usb] Quick fix for build problem
Oleg Kostyuk [Thu, 18 Dec 2014 01:34:34 +0000 (03:34 +0200)]
Merge remote-tracking branch 'tmk/master' into cub_layout
Oleg Kostyuk [Tue, 16 Dec 2014 13:59:10 +0000 (15:59 +0200)]
Updates to CUB's layout
Jun Wako [Wed, 10 Dec 2014 18:52:05 +0000 (03:52 +0900)]
usb_usb: Add SpaceFn and hasu keymap
Jun Wako [Wed, 10 Dec 2014 16:00:32 +0000 (01:00 +0900)]
Merge branch 'usb_usb_hub'
Jun Wako [Wed, 10 Dec 2014 15:59:08 +0000 (00:59 +0900)]
Update README
Jun Wako [Wed, 10 Dec 2014 15:27:37 +0000 (00:27 +0900)]
Change debug print config
Jun Wako [Wed, 10 Dec 2014 14:52:38 +0000 (23:52 +0900)]
Add USB Hub support
Jun Wako [Wed, 10 Dec 2014 06:54:24 +0000 (15:54 +0900)]
Add submodule legitimate USB_Host_Shield_2.0
Jun Wako [Wed, 10 Dec 2014 06:20:32 +0000 (15:20 +0900)]
Remove submodule USB_Host_Shield_2.0
Jun Wako [Wed, 10 Dec 2014 06:10:25 +0000 (15:10 +0900)]
Fix print init; print_set_sendchar in main
Jun Wako [Wed, 10 Dec 2014 05:35:46 +0000 (14:35 +0900)]
Change USB PID
Jun Wako [Fri, 5 Dec 2014 00:59:08 +0000 (09:59 +0900)]
usb_usb: Update for new core layout
Brooks Swinnerton [Sun, 30 Nov 2014 18:27:59 +0000 (13:27 -0500)]
Fixing typo in console mode
tmk [Tue, 25 Nov 2014 02:44:01 +0000 (11:44 +0900)]
hhkb: Change keymap and bootmagic salt key
tmk [Mon, 24 Nov 2014 07:19:00 +0000 (16:19 +0900)]
Merge branch 'u2_fix'
tmk [Thu, 22 Nov 2012 01:06:02 +0000 (10:06 +0900)]
Fix endpoint buffer setting for AT90USB82/162.
tmk [Mon, 24 Nov 2014 06:36:53 +0000 (15:36 +0900)]
Merge branch 'merge_rn42'
tmk [Mon, 24 Nov 2014 06:14:52 +0000 (15:14 +0900)]
Change key_t to keypos_t
tmk [Mon, 24 Nov 2014 05:33:50 +0000 (14:33 +0900)]
Fix debug.h
tmk [Mon, 24 Nov 2014 04:50:33 +0000 (13:50 +0900)]
Merge branch 'rn42' into merge_rn42
Conflicts:
.gitignore
common.mk
common/debug_config.h
common/print.h
tmk [Sun, 23 Nov 2014 04:44:11 +0000 (13:44 +0900)]
Update doc
tmk [Sun, 23 Nov 2014 04:38:10 +0000 (13:38 +0900)]
Remove MCU dependent code from common/keyboard.c
tmk [Sun, 23 Nov 2014 04:08:05 +0000 (13:08 +0900)]
Matrix power saving
Oleg Kostyuk [Thu, 20 Nov 2014 22:09:15 +0000 (00:09 +0200)]
Merge pull request #11 from quantentunnels/cub_layout
Fixed a bug in default keymap
Oleg Kostyuk [Thu, 20 Nov 2014 21:55:47 +0000 (23:55 +0200)]
Documentation: small mistake
Originally reported as https://github.com/cub-uanic/tmk_keyboard/issues/10, all credits to @olivierpons
tmk [Thu, 20 Nov 2014 08:06:46 +0000 (17:06 +0900)]
USB initialize when plug-in during battery powered
Jun Wako [Thu, 20 Nov 2014 07:47:40 +0000 (16:47 +0900)]
ps2_usb: Fix README
tmk [Wed, 19 Nov 2014 16:32:20 +0000 (01:32 +0900)]
adb_usb: Remove old comment of Makefile
tmk [Mon, 17 Nov 2014 19:10:48 +0000 (04:10 +0900)]
Merge branch 'action_fix'
Marius Hintsche [Fri, 14 Nov 2014 22:34:08 +0000 (23:34 +0100)]
fixed bug in numpadlayer in default keymap
there was no way to leave that layer
tmk [Fri, 14 Nov 2014 13:53:25 +0000 (22:53 +0900)]
Add initializer of debug_config for GCC < 4.6.0(#144)
tmk [Fri, 14 Nov 2014 08:46:07 +0000 (17:46 +0900)]
Fix for 'unnamed field in initializer' GCC bug(Fix #143)
projects / max / tmk_keyboard.git / log