1
0
Commit Graph

468 Commits

Author SHA1 Message Date
flabbergast
8952d617ea Merge remote-tracking branch 'upstream/master' into chibios 2015-12-18 20:54:41 +00:00
tmk
9c42227352 Merge pull request #267 from riginding/master
add KC_MRWD and KC_MFFD to rn42
2015-12-05 14:20:51 +09:00
flabbergast
1104dc0a4f Add maple mini pinout pic. 2015-12-03 09:26:22 +00:00
flabbergast
7aab3bb21a STM32F103x fixes. 2015-12-03 09:24:49 +00:00
flabbergast
f108623011 Add maple mini code. 2015-12-03 08:49:55 +00:00
Aurelien Bondis
39c0c27587 Add generic STM32F103C8T6 example. 2015-11-30 17:37:25 +00:00
flabbergast
cee42dd0f6 Merge remote-tracking branch 'upstream/master' into chibios 2015-11-10 20:54:49 +00:00
flabbergast
df1b665a3c Infinity_chibios: improve comments. 2015-11-10 20:54:01 +00:00
tmk
db2015a6b2 hhkb: fix for keymap editor 2015-11-09 11:40:21 +09:00
tmk
14a66a181e alps64: support for keymap editor 2015-11-08 13:05:30 +09:00
Ryan Riginding
e19d574b29 add KC_MRWD and KC_MFFD to rn42
on OSX KC_MRWD and KC_MFFD are used instead of KC_MPRV and KC_MNXT
2015-11-07 17:00:28 +01:00
flabbergast
59f37399f2 Merge branch 'master' into chibios 2015-10-30 07:21:22 +00:00
tmk
fa33719ada Add doc of HHKB original keycodes 2015-10-21 06:59:26 +09:00
flabbergast
7524f5c9c3 Infinity_chibios: select correct bootloader_jump. 2015-10-17 18:23:13 +01:00
Jun Wako
dcac43fa51 Add keymap_hasu.c 2015-10-17 02:52:44 +09:00
Jun Wako
054c86bfe8 Merge branch 'infinity_chibios' of ../tmk_chibios into infinity_chibios 2015-10-16 23:39:26 +09:00
Jun Wako
fd71b3f4ef Add infinity_chibios 2015-10-16 23:36:54 +09:00
Jun Wako
983d3be2da Merge branch 'chibios' of https://github.com/flabbergast/tmk_keyboard into flabbergast-tmk_chibios 2015-10-16 23:27:31 +09:00
tmk
6fe4af82fa Fix port setting of alps64/matrix.c 2015-10-15 11:48:14 +09:00
flabbergast
aa2c568235 Update chibios/Teensy instructions. 2015-10-14 18:04:25 +01:00
flabbergast
b25da7a51d Update chibi/teensy instructions. 2015-10-14 10:35:45 +01:00
flabbergast
c1c8e079ca Chibios: use WFI in idle. WIP suspend stuff. 2015-10-14 10:13:49 +01:00
flabbergast
c61210cfff Add Teensy LC onekey example. 2015-10-12 10:39:24 +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
88c053f78e Move STM32 bootloader address config to separate .h file. 2015-10-05 10:23:31 +01:00
flabbergast
438559f11d Rename some Makefile defines. 2015-09-15 08:52:03 +01:00
flabbergast
1bcf15a8ea Add comments to chibi_onekey Makefile. 2015-09-10 12:50:41 +01:00
flabbergast
66b64efc3d Add chibi_onekey example. 2015-09-10 10:32:15 +01:00
tmk
79cf2d59ae Fix #239 unresponsive keys of HHKB JP during power saving 2015-08-08 16:01:26 +09:00
tmk
d4220ac9f3 hhkb: Add power saving code of matrix scan for JP 2015-07-23 11:57:15 +09:00
tmk
e1e0e5b4fb onekey: Add V-USB build 2015-07-12 06:59:58 +09:00
tmk
507ebb34f5 alps64: Change keymaps and USB descriptors. 2015-06-26 08:49:03 +09:00
tmk
c01ecce137 Revert "hhkb: Fix bug of matrix initialization for JP"
This reverts commit adfd5b92eb.
2015-05-13 17:31:26 +09:00
tmk
8e7153d190 hhkb: Change document 2015-05-13 17:26:24 +09:00
tmk
a8822a16b4 hhkb: Fix scan rate for HHKB JP #203 2015-05-13 16:53:32 +09:00
tmk
b085d762d5 hhkb: Add build options 2015-05-13 16:40:08 +09:00
tmk
81fe1fda61 hhkb: Change keymap 2015-05-13 16:30:14 +09:00
tmk
177400b7e0 alps64: Change keymap 2015-05-13 16:25:41 +09:00
Jun Wako
55fc97f957 Change mbed sdk path 2015-04-24 16:27:40 +09:00
tmk
22dd5dae98 Update for the latest mbed sdk 2015-04-24 15:03:59 +09:00
tmk
7860d09914 Change TMK_DIR setting 2015-04-10 01:53:24 +09:00
tmk
b4e2d325f3 Change TOP_DIR to TMK_DIR in makefiles 2015-04-09 16:20:42 +09:00
Jun Wako
63f462a460 hhkb: Chane keymap for hasu 2015-04-07 09:29:06 +09:00
Jun Wako
adfd5b92eb hhkb: Fix bug of matrix initialization for JP 2015-04-07 09:27:28 +09:00
tmk
d5ac54449a Add alps64 2015-04-05 14:41:14 +09:00
Jun Wako
0d222db31f infinity: Fix disabling watchdog
- watchdog is timed out before disabling it by mbed startup
- old booloader disable watchdog while new(2015/01) doesn't
2015-03-22 10:51:30 +09:00
Jun Wako
c35c4283b9 infinity: For production model and add SpaceFn 2015-03-05 10:38:18 +09:00
Ralf Schmitt
012ec9e379 NerD, turn BRK into PAUS to get bootloader jump back. 2015-01-21 21:16:09 +01:00
tmk
a5122d5aba Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid
Conflicts:
	README.md
2015-01-19 11:17:05 +09:00
tmk
1cda7b79fb Fix typo 'keyobard' #166 2015-01-19 10:35:06 +09:00
tmk
d32b955af6 Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-forhasu 2015-01-19 10:19:47 +09:00
tmk
40fd75e5ed hhkb: Update RN-42 docs 2015-01-19 10:13:42 +09:00
Ralf Schmitt
2d74020331 Added NerD 80% (TKL) support 2015-01-18 11:45:24 +01:00
Ralf Schmitt
d9b5f5110e Added NerD 60% support 2015-01-18 11:43:37 +01:00
tmk
099701dd31 hhkb: Integrate RN-42 support, remove hhkb_rn42 2015-01-16 10:21:18 +09:00
tmk
ce66988650 hhkb_rn42: Move doc 2015-01-16 08:26:59 +09:00
tmk
3e88e8b761 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.
2015-01-16 05:22:29 +09:00
tmk
517817b9c7 rn42: Update doc 2015-01-15 17:08:49 +09:00
tmk
2626a32260 Use pgmspace for RN-42 commands 2015-01-15 17:08:49 +09:00
tmk
3b3af3bae0 Increase buffer of rn42_gets() and change rn42_linked() 2015-01-15 17:08:49 +09:00
tmk
1b95b3c51a rn42: Add commands for RN-42 2015-01-15 17:08:49 +09:00
tmk
4f121de7ad rn42: Add rn42_getc and rn42_gets 2015-01-15 17:08:49 +09:00
tmk
a679928620 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.
2015-01-15 17:08:49 +09:00
tmk
884c2ab0f2 Update doc 2015-01-15 17:08:49 +09:00
tmk
160e02d06a Change RN42 state display 2015-01-15 17:08:49 +09:00
tmk
ebe4373258 Fix power saving while USB suspended
- doesn't pwoer save while Bluetooth turns on
2015-01-15 17:08:49 +09:00
tmk
86f82dd02d Add wait for charging capacitance of ADC S/H 2015-01-15 17:08:48 +09:00
tmk
2d7973fc3f Fix: enable digital input for PF5 2015-01-15 17:08:48 +09:00
tmk
25aee431bd Clean ADC code of battery_voltage() 2015-01-15 17:08:48 +09:00
tmk
825be9d121 Disable input buffer for ADC 2015-01-15 17:08:48 +09:00
tmk
de29f986a7 Update MEMO 2015-01-15 17:08:48 +09:00
tmk
570bcb2ed1 Add LUFA device state to command info 2015-01-15 17:08:48 +09:00
tmk
20caf673d8 Fix lufa sendchar() infinite wait loop
- FrameNumber is not updated when adapter powered
- can be blocked in sendchar() when pluged into AC adapter
2015-01-15 17:08:48 +09:00
tmk
9179246a1d Fix USB plug-in while BT mode falls to be enumerated 2015-01-15 17:08:48 +09:00
tmk
05795cb003 Compensate timer during prower down 2015-01-15 17:08:48 +09:00
Jun Wako
10a6b2c7d8 hhkb: Add Makefile.jp for HHKB JP 2015-01-11 01:54:17 +09:00
Jun Wako
d0fefb76f8 infinity: Add initial files for keyboard support 2015-01-04 17:21:43 +09:00
Jun Wako
c6e533ce83 infinity: Move project specific files to local 2015-01-04 17:21:43 +09:00
Jun Wako
4acde45102 Fix linker script for NVIC vector on RAM 2015-01-04 17:21:43 +09:00
Jun Wako
d5e5dbd0aa Add openocd config files for K20 2015-01-04 17:21:43 +09:00
Jun Wako
e259a722e7 Add keyboard/infinity 2015-01-04 17:21:43 +09:00
Vlastimil Ovčáčík
a6d33e2c98 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
2014-12-28 09:49:57 +01:00
tmk
4192bce16b hhkb: Change keymap and bootmagic salt key 2014-11-25 11:44:57 +09:00
tmk
e2077cad45 Change key_t to keypos_t 2014-11-24 15:14:52 +09:00
tmk
363950982a Merge branch 'rn42' into merge_rn42
Conflicts:
	.gitignore
	common.mk
	common/debug_config.h
	common/print.h
2014-11-24 13:50:33 +09:00
tmk
60096e11c7 Update doc 2014-11-23 13:44:11 +09:00
tmk
608ebe2686 Matrix power saving 2014-11-23 13:08:05 +09:00
tmk
6c06b9031f Add power control of key switch board 2014-10-02 09:58:47 +09:00
tmk
bfd2d969b4 Add keyboard LED control via Bluetooth 2014-09-22 14:20:49 +09:00
tmk
2015027da3 Add FET swtich for battery ADC 2014-09-20 06:12:49 +09:00
tmk
d8dd18b421 Improve rn42_task time resolution 2014-09-05 11:37:05 +09:00
tmk
38714e8c85 Update MEMO and remove a build option to save flash 2014-09-04 17:39:29 +09:00
tmk
3b81ffc16c Monitor battery and alert low voltage 2014-09-04 17:08:23 +09:00
tmk
02939ab1d8 Add battery management 2014-09-04 05:30:00 +09:00
tmk
807ed33a9a Fix rn42_linked() to use pullup 2014-08-30 15:59:41 +09:00
Ralf Schmitt
af19f56ec9 Support for Lightpad keypad 2014-08-24 16:31:12 +02:00
tmk
28c1bf294c Add files missing for JP support. 2014-08-24 09:51:21 +09:00
tmk
4f22a45b99 Add support for HHKB JP 2014-08-20 13:36:15 +09:00
tmk
17f22da3cf Update MEMO.txt 2014-07-30 14:38:27 +09:00
tmk
e4b9541041 Add connection indicator 2014-07-30 14:38:27 +09:00
tmk
f441ad07cc Add initial setting of Linked pin 2014-07-30 14:38:27 +09:00
tmk
ae28b16fc6 Add battery monitor and LED control 2014-07-30 14:38:27 +09:00
tmk
21e68fbea4 Add help message 2014-07-30 14:38:27 +09:00
tmk
4b2b32a14b Add rn42_lined(): connection status(GPIO2) 2014-07-30 14:38:26 +09:00
tmk
3e7875455e Add flow control by firmware to serial_uart 2014-07-30 14:38:26 +09:00
tmk
50bcaa66c4 Clean up mbed_onekey 2014-07-30 14:38:26 +09:00
tmk
59ea5e02f7 Mkdir rn42 2014-07-30 14:38:26 +09:00
tmk
b4e4f599df Add rn42_task 2014-07-30 14:38:26 +09:00
tmk
fa545c87f7 Fix rn42.h API 2014-07-30 14:38:26 +09:00
tmk
862f519e24 Add software UART and battery monitor 2014-07-30 14:38:26 +09:00
tmk
01fa462e2c Fix configure mode of RN-42 2014-07-30 14:38:26 +09:00
tmk
1619d68cb2 Update MEMO.txt 2014-07-30 14:38:26 +09:00
tmk
6cec158d1a Update TODO 2014-07-30 14:38:26 +09:00
tmk
faf9adb315 Change keymap for rn42
- rn42 doesn't support mouse button 4 and 5
- rn42 deosn't support browser back and forward
2014-07-30 14:38:26 +09:00
tmk
cd86104377 Fix consumer key bug 2014-07-30 14:38:26 +09:00
tmk
31a298f9d9 Add RN-42 Bluetooth module support 2014-07-30 14:38:26 +09:00
tmk
4069776c02 Add initial files for RN-42 2014-07-30 14:38:25 +09:00
tmk
ea60dae6e6 Fix for new API(key_t to keypos_t) 2014-07-30 14:38:25 +09:00
tmk
2e0e21d444 Port action_* to mbed 2014-07-30 14:38:25 +09:00
tmk
4c8e0fd0bd Port ps2_usb to mbed 2014-07-30 14:07:43 +09:00
tmk
80c3ff5fa0 Fix build files for mbed 2014-07-30 14:07:43 +09:00
tmk
e81c70149e Fix common files for mbed 2014-07-30 14:07:43 +09:00
tmk
c67ae2a6b5 Port action_* to mbed 2014-07-30 14:07:43 +09:00
tmk
04fe78ee0a Fix print and timer 2014-07-30 14:07:43 +09:00
tmk
867f115bee Port timer to mbed 2014-07-30 14:07:43 +09:00
tmk
f15b2691c9 Add keyboard/mbed_onekey 2014-07-30 14:07:43 +09:00
tmk
31b3e4bc38 Fix 'debug-off' target of hhkb to remove 'print' 2014-07-20 00:37:49 +09:00
tmk
452866319b Fix READEM of hhkb and doc/build.md 2014-07-10 15:28:36 +09:00
tmk
92004d6786 Fix document on HHKB internal 2014-07-09 16:33:40 +09:00
tmk
6013483050 Add HHKB JP support
- scan matrix about twice faster
2014-07-09 15:31:52 +09:00
Ralf Schmitt
a70acecb1c Added support for bpiphany's Kitten Paw controller (Costar Majestouch) 2014-06-27 13:04:23 +02:00
tmk
9fdb02017b Add Ctrl + Up(SpaceFN) -> PgUp 2014-06-12 17:23:02 +09:00
tmk
caf7b4e68a Make keymap_hhkb as default and change keymap_hasu 2014-06-12 17:19:58 +09:00
tmk
00e9a342df Fix 'Shift Parentheses' example 2014-04-25 11:47:02 +09:00
tmk
3c5add5f80 Change LUFA build options 2014-04-24 11:26:06 +09:00
Ralf Schmitt
589d99b448 New macro: ACTION_BACKLIGHT_LEVEL(level)
To have full control of the backlight level.
2014-04-08 21:02:46 +02:00
Ralf Schmitt
1482fe92a0 Added Lightsaber FN-layer 2014-03-22 13:13:37 +01:00
Ralf Schmitt
498ea75d1b Lightsaber clean ups 2014-03-22 12:41:45 +01:00
Ralf Schmitt
526d988a0c Added basic led+backlight support 2014-03-19 23:58:08 +01:00
Ralf Schmitt
160678a7b8 Updated Lightsaber read me 2014-03-19 00:21:45 +01:00
Ralf Schmitt
5ca3bde10a Support for Lightsaber keyboard 2014-03-19 00:15:56 +01:00
Thomas Russell Murphy
a86c1e2b71 Spellchecking keyboard README files. 2014-01-07 11:03:18 +09:00
tmk
0b917d4f10 Fix README.md of hhkb 2013-11-30 12:33:32 +09:00
tmk
119c34e094 Add SpaceFN layout for HHKB 2013-11-30 12:03:19 +09:00
tmk
fd7833388c Add new keymap framework 2013-11-29 09:12:28 +09:00
tmk
05be3d85d1 Fix pin configuration of onekey for PS/2 mouse 2013-11-28 14:43:47 +09:00
tmk
4e36159be2 Add HHKB keymap file on gh60 2013-11-25 09:27:25 +09:00
tmk
beacd5872c Support GH60 Rev.B PCB as well as Rev.A(issue #64)
- Port of col8 is PB0 in Rev.A while PB7 in Rev.B
2013-11-21 23:31:20 +09:00
tmk
4e7ec43c3f Add SpaceFN layout to gh60 2013-11-21 19:32:17 +09:00
tmk
22e293696d Add new keymap management on gh60 2013-11-21 16:34:34 +09:00
tmk
a9c3f4750b Configure PS/2 mouse build options to onekey 2013-11-21 13:00:08 +09:00
tmk
c6abcb6d89 Add build options of ps2_mouse 2013-11-20 15:28:58 +09:00
tmk
755e4d8b00 Add PS/2 mouse configure to onekey 2013-11-19 03:39:15 +09:00
tmk
eea3b699a6 Merge branch 'onekey' 2013-10-31 12:30:42 +09:00
tmk
b9fe36f237 Add USE_LEGACY_KEYMAP in config.h of ps2_usb and IIgs 2013-10-28 11:43:45 +09:00
tmk
ee109d68d6 Delete MOUSEKEY_DELAY_TIME in config.h 2013-10-28 11:32:19 +09:00
tmk
35f9f30074 Add timeout option to MODS_ONESHOT #66 2013-10-07 23:28:17 +09:00
tmk
9f29fa6bf3 Fix version info command 2013-09-19 00:51:44 +09:00
tmk
259c4a040a Add build option KEYMAP_SECTION for keymap editor 2013-09-11 14:01:47 +09:00
tmk
f7395268c0 Add ld script for keymap section 2013-09-11 13:20:58 +09:00
tmk
b6677f10e3 Add files for onekey(issue #56)
- https://github.com/tmk/tmk_keyboard/issues/56
2013-08-05 16:23:17 +09:00
tmk
e7c2af78b7 Change README Makefile and config.h in hhkb 2013-07-29 00:53:18 +09:00
tmk
daa4a4235f Add NKRO support for LUFA 2013-07-28 17:34:41 +09:00
tmk
05225dd9d8 Add bootmagic salt key to avoid accidental configuration 2013-07-24 00:41:28 +09:00
tmk
2721022078 Add mechanical locking switch support for NumLock and ScrollLock 2013-07-23 10:56:03 +09:00
tmk
6aaa6e0ef9 Add support for macro media/system keys 2013-07-23 07:53:18 +09:00
tmk
f4c69652c1 Merge branch 'hhkb_tmk' 2013-07-11 16:26:00 +09:00
tmk
d2ea9e80a0 Fix README and doc 2013-07-11 16:23:53 +09:00
tmk
9d7278682e Add Caps Lock LED on PD6 2013-07-11 09:07:02 +09:00
tmk
0e37dd2ec5 Add power control of keyswitch board and tweak scan wait 2013-07-08 14:38:03 +09:00
Wraul
eef6aa58b7 Correction to Phantom readme markdown. 2013-07-07 18:48:25 +02:00
Wraul
a21359a098 Fix Phantom scroll lock LED. 2013-07-07 18:48:25 +02:00
yeeeargh
e0cb9cf30b Added standard layouts for ANSI and ISO. Moved the initial layout from alaricljs to a seperate layout file. If no layout gets defined ANSI is used as a default.
Added a README.md with links to the deskthority wikipages for this project and some build instructions.
2013-07-03 13:04:33 +02:00
tmk
d965822857 Tweak tap timing for slow tap on space bar 2013-07-03 11:03:59 +09:00
tmk
e9796ff462 Add Makefile for tmk board and tweak scan wait 2013-07-03 11:02:33 +09:00
tmk
681e019450 Fix debouncing bug in hid_liber(Issue #26) 2013-06-25 09:33:24 +09:00
Wraul
43e5ca60af Initial implementation for the KMAC 2013-06-22 17:23:37 +09:00
tmk
bebbe15562 Add power consumptions to doc 2013-06-19 22:07:16 +09:00
tmk
c254a0d038 Change tapping parameter for hhkb/iwrap 2013-06-19 22:04:18 +09:00
Mathias Andersson
43b4e2d3b1 Add Phantom README. 2013-05-27 20:53:11 +02:00
Mathias Andersson
6e548590c4 Move Phantom keymaps to separate header files. 2013-05-27 20:53:11 +02:00
Mathias Andersson
28aeef231b Fix Phantom sleep LED. 2013-05-27 20:53:11 +02:00
Mathias Andersson
9e84c89535 Correct order of rows for Phantom 2013-05-27 20:53:11 +02:00
Mathias Andersson
5c5312c508 Update Phantom debug print
This updates the Phantom project to use the new debug print functions.
2013-05-27 20:52:28 +02:00
tmk
862a006190 Fix keymap of hid_liber from yeeeargh 2013-05-21 10:35:17 +09:00
tmk
796defa86c Fix deprecated 'prog_*' typedef - Issue #34
- Remove prog_char from xpritnf
- Remove prog_macro_t from acton_macro

avr-libc-1.8 removed 'prog_*' typedef because the usage of
the __progmem__ attribute on a type is not supported in GCC.
http://www.nongnu.org/avr-libc/changes-1.8.html
2013-05-21 10:16:55 +09:00
tmk
92b0674a7f Fix makefile, debug print and keymap of HHKB 2013-05-15 00:22:27 +09:00
Mathias Andersson
3f48b13f81 Code style fixes for Phantom matrix. 2013-05-02 20:37:41 +02:00
Mathias Andersson
1e07b60d3a Add full 7bit support to Phantom keymap. 2013-05-02 20:37:31 +02:00
Mathias Andersson
2d31fcf187 Change Phantom matrix scan to be similar to GH60. 2013-05-01 15:33:48 +02:00
Mathias Andersson
71fabf72e0 Improve matrix print for Phantom. 2013-05-01 13:21:08 +02:00
Mathias Andersson
3d503c8932 Fix debouncing on Phantom. 2013-04-28 18:54:38 +02:00
Mathias Andersson
8633cb170f Adjust Phantom layouts formating.
Make the layout formating better match that of GH60.
2013-04-21 22:13:14 +02:00
Mathias Andersson
c4b012cdb5 Updated Phantom for new keymap framework. 2013-04-21 22:06:14 +02:00
tmk
a77ae5f843 Add support of iWRAP5
- mouse virtical wheel
- consumer page
2013-04-18 15:52:23 +09:00
tmk
540d0700dc Remove common/controller_teensy.h 2013-04-13 11:30:08 +09:00
tmk
c26a5eb2ac Fix keymap for new actions 2013-04-05 03:44:42 +09:00
tmk
fbea2a3aae Fix keymap of hhkb for new actions 2013-04-05 03:27:10 +09:00
tmk
489fd75fdf Fix keymap of gh60 2013-04-05 01:39:17 +09:00