1
0
Commit Graph

399 Commits

Author SHA1 Message Date
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
Kai Ryu
f59510aea8 Implement a tricky esc function for GH60 2014-11-18 18:36:29 +09:00
Kai Ryu
9414e34f5b Update features for GHPad
- USB 6KRO
- SoftPWM LED
- Breathing LED
- Fading LED
- Typing LED
- Ledmap
- Ledmap in EEPROM
2014-10-30 13:53:26 +09:00
tmk
6c06b9031f Add power control of key switch board 2014-10-02 09:58:47 +09:00
Kai Ryu
24b533adca Update features for RedScarfII
- USB 6KRO
- SoftPWM LED
- Breathing LED
- Fading LED
- Typing LED
- Ledmap
- Ledmap in EEPROM
2014-09-29 17:41:45 +09:00
Kai Ryu
8e055c5d73 Merge branch 'redscarfII' 2014-09-22 18:33:21 +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
Kai Ryu
4ec4ad8253 Fix a mis-config of ledmap for GH60 2014-09-02 12:21:36 +09:00
tmk
807ed33a9a Fix rn42_linked() to use pullup 2014-08-30 15:59:41 +09:00
Kai Ryu
38e17a8704 Add build option FADING_LED_ENABLE 2014-08-25 16:29:09 +09:00
Kai Ryu
5ea92acdf7 Change implement from breathing led to fading led 2014-08-25 14:03:23 +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
Kai Ryu
7a3652f6fa A typing led feature 2014-08-22 19:18:12 +09:00
tmk
4f22a45b99 Add support for HHKB JP 2014-08-20 13:36:15 +09:00
Kai Ryu
78242ebba1 Add init callback function to softpwm_led 2014-08-03 12:00:18 +09:00
Kai Ryu
8b070f0f54 Merge branch 'ledmap' 2014-08-03 11:33:02 +09:00
Kai Ryu
49e70286a6 Improve softpwm to control LED respectively 2014-08-02 10:15:57 +09:00
Kai Ryu
83ba4d37ad Fix a bug that led cannot light up when backlight is off 2014-07-31 13:49:40 +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
Kai Ryu
54360bf85b Move backlight to a separated bit to realize complex ledmap combinations 2014-07-25 14:24:57 +09:00
Kai Ryu
34886dfffb Implement ledmap and fix bugs 2014-07-24 15:03:58 +09:00
Kai Ryu
3ea4495bf5 Merge remote-tracking branch 'upstream/master'
Conflicts:
	common/action_util.c
2014-07-23 13:15:19 +09:00
Kai Ryu
b9c65be036 Implement ledmap-in-eeprom feature 2014-07-23 10:02:14 +09:00
Kai Ryu
872c619cdf Experimental implement of led mapping for GH60 2014-07-20 12:53:25 +09:00
tmk
31b3e4bc38 Fix 'debug-off' target of hhkb to remove 'print' 2014-07-20 00:37:49 +09:00
Kai Ryu
61051c74ee Experimental implement SoftPWM for GH60 2014-07-18 11:17:45 +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
Kai Ryu
58ee2bcdfc Enable 6KRO and NKRO for GH60 2014-07-05 23:31:33 +09:00
Kai Ryu
bcdfa31e83 Merge branch '6kro' 2014-07-05 23:30:31 +09:00
Ralf Schmitt
a70acecb1c Added support for bpiphany's Kitten Paw controller (Costar Majestouch) 2014-06-27 13:04:23 +02:00
Kai Ryu
456559d422 Add logo led for RedScarfII 2014-06-26 12:26:59 +09: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
Kai Ryu
9cf8d44a7f Fix keymap for keymap_in_eeprom 2014-05-26 13:37:54 +09:00
Kai Ryu
9c1d9d7bb3 Merge branch 'keymap_in_eeprom'
Conflicts:
	common.mk
	common/keyboard.c
	keyboard/gh60/Makefile
	keyboard/gh60/Makefile.pjrc
2014-05-26 12:12:51 +09:00
Kai Ryu
d37b6d7d5b Remove keymap_ex changes 2014-05-26 12:04:31 +09:00
Kai Ryu
ee9913a863 Implement 6KRO feature 2014-05-12 18:47:50 +09:00
Kai Ryu
d2a57d82d5 New branch for 6KRO feature 2014-05-12 17:26:31 +09:00
Kai Ryu
8748b6080f Fix some definition and declaration 2014-05-07 11:39:07 +09:00
Kai Ryu
f2fd5127e1 Merge remote-tracking branch 'upstream/master' 2014-05-07 11:16:59 +09:00
Kai Ryu
505f933944 New branch for RedScarfII 2014-05-05 22:24:40 +09:00
tmk
00e9a342df Fix 'Shift Parentheses' example 2014-04-25 11:47:02 +09:00
Kai Ryu
f6bfbd0f48 Merge branch 'breathing_led' 2014-04-25 00:09:08 +09:00
tmk
3c5add5f80 Change LUFA build options 2014-04-24 11:26:06 +09:00
Kai Ryu
c97edcdb30 Add a custom keymap for ghpad rev.RS 2014-04-18 15:10:49 +09:00
Kai Ryu
f82a77cc15 Simplifiy breathing led feature and code 2014-04-18 14:33:57 +09:00
Kai Ryu
e26869d70a Change software pwm method to fix blink issue 2014-04-18 12:12:59 +09:00
Kai Ryu
3c8412b1e5 Bug fix and optimization of breathing led 2014-04-16 12:12:15 +09:00
Kai Ryu
91b149f785 New branch for breathing led feature 2014-04-15 16:28:48 +09:00
Kai Ryu
f56f9030f6 Add macro for compiling with led matrix disabled 2014-04-11 17:29:57 +09:00
Kai Ryu
9a6b1cc49d Merge branch 'master' into led_matrix 2014-04-11 17:04:41 +09:00
Kai Ryu
19ef3f825a Add macro defination for led matrix 2014-04-11 16:54:16 +09:00
Kai Ryu
c19d349622 Remove unnecessary changes 2014-04-11 12:25:15 +09:00
Kai Ryu
0f31162554 A sample implementation of keymap-in-eeprom 2014-04-10 16:04:50 +09:00
Kai Ryu
54028c2b65 Fix backlight issue for gh60 revB 2014-04-09 17:21:09 +09:00
Kai Ryu
ab3349724e Disable PS/2 mouse feature by default 2014-04-09 17:20:31 +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
Kai Ryu
8a3b663762 Add PS2 mouse support for gh60 2014-04-08 18:05:39 +09:00
Kai Ryu
d004baf727 Add backlight level support for gh60 revB 2014-04-08 18:02:20 +09:00
Kai Ryu
ef8d032029 Add bootmagic and magic command support for ghpad 2014-04-08 17:56:21 +09:00
Kai Ryu
5bc8b5dcb6 Add support for full-led revision of ghpad 2014-04-04 12:22:22 +09: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
Kai Ryu
2a119e1c59 New branch for led_matrix 2014-02-10 19:26:00 +09:00
Kai Ryu
91d22894b0 Impement led matrix for GH60 rev.CNY 2014-01-14 16:13:01 +09:00
Kai Ryu
be407eb8d3 Some implementations of led matrix 2014-01-13 22:04:24 +09:00
Kai Ryu
fd4959b8b6 Add support for GH60 rev.CNY 2014-01-11 22:23:49 +09:00
Kai Ryu
2a2c7b8333 Add a simple backlight support for ghpad 2014-01-10 09:18:52 +09:00
Kai Ryu
e35fdfc5c7 Support backlight for GH60 revB 2014-01-10 09:17:28 +09:00
Kai Ryu
ffaff2845a Enable NKRO by default 2014-01-10 09:15:41 +09:00
Thomas Russell Murphy
a86c1e2b71 Spellchecking keyboard README files. 2014-01-07 11:03:18 +09:00
Kai Ryu
0410064f50 Update Makefile.pjrc 2013-12-13 21:40:00 +09:00
Kai Ryu
abdd404419 Update keymaps for ghpad 2013-12-13 21:38:36 +09:00
Kai Ryu
dbf5430c5f Add additional definitions 2013-12-12 17:15:35 +09:00
Kai Ryu
2bcd171104 Fix for tmk's changes 2013-12-12 17:06:29 +09:00
Kai Ryu
63b3ea9a1e Merge remote-tracking branch 'upstream/master'
Conflicts:
	common.mk
	common/keyboard.c
	keyboard/gh60/Makefile
	keyboard/gh60/keymap_hasu.c
	keyboard/gh60/matrix.c
2013-12-12 13:38:49 +09:00
Kai Ryu
4a82c33fc0 Compatibility change for separated right shift 2013-12-12 12:58:14 +09:00
Kai Ryu
50d5106d66 New branch to support GHPad 2013-12-02 16:10:34 +09:00
Kai Ryu
17bf466ab5 Change checksum algorism 2013-12-02 11:22:34 +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
Kai Ryu
e5a48615ec Fix confusion of size and count 2013-11-21 13:44:32 +09:00
Kai Ryu
d923f5aef1 Fix misdefine of BACKLIGHT_LEVELS 2013-11-21 13:13:07 +09:00
Kai Ryu
2afa7e162b Add poker2-like keymap for gh60 2013-11-21 13:08:32 +09:00
tmk
a9c3f4750b Configure PS/2 mouse build options to onekey 2013-11-21 13:00:08 +09:00
Kai Ryu
bcc9b518f5 Add support for GH60 PCB revB and revC 2013-11-21 12:41:09 +09:00
Kai Ryu
4f3b84f4c5 Add custom backlight feature 2013-11-21 12:33:03 +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