1
0
Commit Graph

542 Commits

Author SHA1 Message Date
Kai Ryu
27238c9023 Add experimental code for testing with GH60's HW 2015-04-07 15:42:45 +09:00
Kai Ryu
35df66906b Change usb descriptions of TentaPad 2015-04-07 15:42:43 +09:00
Kai Ryu
72b080539b New branch for TentaPad 2015-04-07 15:42:42 +09:00
Kai Ryu
2bfb212b15 Merge remote-tracking branch 'upstream/master'
Conflicts:
	common/avr/suspend.c
2015-04-07 14:57:03 +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
Kai Ryu
6ad165a7cf Fix keymap of RedScarfIII to match circuit 2015-01-29 16:01:10 +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
Kai Ryu
ac475cdd87 Add keypad 00 macro for RedScarfIII 2015-01-09 14:50:24 +09:00
Kai Ryu
1f80a674fd Implement suspend action for RedScarfIII 2015-01-09 11:45:50 +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
Kai Ryu
62e50ace2b Simplify default keymap of RedScarfIII 2015-01-03 01:21:30 +09:00
Kai Ryu
75ac0d1f94 Change method of converting rgb id to yc059 code 2015-01-03 01:19:12 +09:00
Kai Ryu
3e10e0e9a6 Change name of rgb mode and implement rgb step feature 2015-01-02 23:49:00 +09:00
Kai Ryu
2e4100428e Add a master switch of rgb controlled by PE2 2015-01-01 01:54:53 +09:00
Kai Ryu
9e625c84f1 Fix compatibility issue with IR remoter 2015-01-01 01:54:33 +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
Kai Ryu
f55872e09f Fix issue that softpwm interrupt breaks yc059 sending 2014-12-17 19:00:40 +09:00
Kai Ryu
7a769e95fb New branch for RedScarfIII 2014-12-17 15:49:52 +09:00
Kai Ryu
215419e3b9 Fix backlight blinking issue by another way 2014-12-12 16:40:03 +09:00
Kai Ryu
3cca7e0591 Add built-in macro keypad 00 for RedScarfII 2014-12-12 15:10:26 +09:00
Kai Ryu
3e6e61000e Change default ledmap for RedScarfII 2014-12-12 13:29:11 +09:00
Kai Ryu
b08054dba1 Some minor fixes for RedScarfII 2014-12-12 13:28:19 +09:00
Kai Ryu
430e15e0ba Fix backlight blinking issue for RedScarfII 2014-12-12 13:23:53 +09:00
Kai Ryu
08f6cf85ec New features for SMART68
- SoftPWM LED
- Breathing LED
- Fading LED
- Typing LED
- Ledmap
- Ledmap in EEPROM
- Built-in function tricky esc
2014-12-10 19:54:39 +09:00
Kai Ryu
a0a5d52531 Modify default keymap 2014-12-10 19:54:38 +09:00
Kai Ryu
19130e5f0b Change build option of SMART68 2014-12-10 19:54:36 +09:00
Kai Ryu
aca37583d0 Add missed function declaration 2014-12-10 19:54:35 +09:00
Kai Ryu
3ebc97654b Modify default keymap 2014-12-10 19:54:33 +09:00
Kai Ryu
58d598d5ee Add breathing backlight support for smart68 2014-12-10 19:54:32 +09:00
Kai Ryu
d8f4801f34 Fix bug of col15 2014-12-10 19:54:31 +09:00
Kai Ryu
0ed8af7b16 Fix bug of col6 and pwm 2014-12-10 19:54:29 +09:00
Kai Ryu
b53a8f959e New branch for SMART68 2014-12-10 19:54:28 +09:00
Kai Ryu
8b8bfaff65 New features for LR94
- SoftPWM LED
- Breathing LED
- Fading LED
- Typing LED
- Ledmap
- Ledmap in EEPROM
- Built-in macro keypad 00
2014-12-10 11:20:09 +09:00
Kai Ryu
33b95c5199 Change breathing led to use timer1 2014-12-10 11:20:05 +09:00
Kai Ryu
2826892d44 Fix for RShift for LR94 2014-12-10 11:20:03 +09:00
Kai Ryu
062a2cdfd1 Fix some definition 2014-12-10 11:20:01 +09:00
Kai Ryu
6e392e7a64 Change project name to LR94 2014-12-10 11:20:00 +09:00
Kai Ryu
8521712bc0 Add breathing backlight support for LR92 2014-12-10 11:19:58 +09:00
Kai Ryu
39512fafe9 Change project name to LR92 2014-12-10 11:19:57 +09:00
Kai Ryu
92f77ab7ad Add default keymap for lr96 2014-12-10 11:19:55 +09:00
Kai Ryu
78e21c18c0 A quick fix for backlight 2014-12-10 11:19:54 +09:00
Kai Ryu
e96f00a0bf Fix bug of matrix scan 2014-12-10 11:19:52 +09:00
Kai Ryu
cda0295e7e Correct default keymap in makefile 2014-12-10 11:19:51 +09:00
Kai Ryu
932cdb7de5 Implement matrix and keymap 2014-12-10 11:19:49 +09:00
Kai Ryu
2546eacdd5 New branch for LR96 2014-12-10 11:19:48 +09:00
Kai Ryu
f73fd6ee59 Fix bug for GH60 RevB that ledmap is overlapped with keymap in eeprom 2014-11-28 11:27:43 +09:00
Kai Ryu
ba26bdd937 Implement keypad 00 macro for GH60 2014-11-27 15:32:14 +09:00
Kai Ryu
8aa74a7cea Fix a bug for GHPad that cannot turn backlight off 2014-11-27 15:20:18 +09:00
Kai Ryu
4d72c33e6d Fix bug for GHPad that ledmap is overlapped with keymap in eeprom 2014-11-27 15:19:20 +09:00
Kai Ryu
7b5e614b0b Implement a keypad 00 macro for GHPad 2014-11-26 20:07:37 +09:00
Kai Ryu
50081bccbf Change config for GHPad 2014-11-25 18:48:44 +09:00
Kai Ryu
afe956bcc1 Change key_t to keypos_t 2014-11-25 18:48:09 +09:00
Kai Ryu
21195211a1 Change to fix improved ledmap 2014-11-25 18:46:18 +09:00
Kai Ryu
f6643a082c Improve ledmap feature
- Change date type of ledmap from byte to word
- New reverse bit, reversing binding stats
- Fix minor bugs
2014-11-25 18:23:16 +09:00
tmk
4192bce16b hhkb: Change keymap and bootmagic salt key 2014-11-25 11:44:57 +09:00
Kai Ryu
15d9c0a692 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	common.mk
	common/action_util.c
2014-11-25 11:06:28 +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
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