1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

514 commits

Author SHA1 Message Date
Jack Humbert 85cc5d890e daniel 2015-05-27 23:15:08 -04:00
Jack Humbert f2ec0f3a2c Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-05-27 22:43:37 -04:00
Jack Humbert e7435a4022 daniel 2015-05-27 22:43:34 -04:00
Jack Humbert ed7607645a Merge pull request #16 from cr3473/master
fixed the macros for hard colemak
2015-05-27 17:09:28 -04:00
cr3473 8c788f70f6 fixed the macros for hard colemak 2015-05-27 14:03:45 -07:00
Jack Humbert 1add9b72e7 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-05-27 12:26:02 -04:00
Jack Humbert 49ba5817c4 catching up 2015-05-27 12:25:38 -04:00
cr3473 a286c38797 New, improved, extended layout 2015-05-27 08:35:55 -07:00
cr3473 b36d1a87da Merge remote-tracking branch 'upstream/master' 2015-05-27 08:29:48 -07:00
Jack Humbert d61d1f5ca3 layouts, default 2015-05-21 19:59:39 -04:00
Jack Humbert cdccebafe1 default w/qwerty 2015-05-19 01:03:54 -04:00
Jack Humbert b90ee43f57 files 2015-05-18 21:14:21 -04:00
Jack Humbert 0e189b6bdd quark 2015-05-15 21:57:29 -04: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
Jack Humbert cb3e499cc7 backlight stuff 2015-05-07 15:34:46 -04:00
Jack Humbert 1e0ae2936b quark 2015-05-02 23:00:47 -04:00
Reed Swiernik 15110bf7a0 Corrected makefile common var 2015-04-29 02:55:16 -04:00
Reed Swiernik 85f8506caa Moved keymap file location and fixed bugs in keymap_reed.c 2015-04-29 02:55:00 -04:00
Reed Swiernik eadb08b113 Update README.md 2015-04-25 12:18:45 -04:00
Reed Swiernik 79f70b20d9 Update README.md
Switched around more readme stuff
2015-04-25 12:18:34 -04:00
Reed Swiernik d0391d9ed7 Update README.md
This stupid readme...
2015-04-25 12:18:21 -04:00
Reed Swiernik 835207193a Update README.md
Updated formatting again...
2015-04-25 12:18:11 -04:00
Reed Swiernik c85f68d9cd Update README.md
Changed formatting mistake
2015-04-25 12:17:54 -04:00
Reed Swiernik e3ebae521e Updated readme with new build info 2015-04-25 12:17:42 -04:00
Reed Swiernik b060714efd Changed del key and added docs 2015-04-25 12:17:28 -04:00
Reed Swiernik 0541af4ff9 Updated makefile to properly handle non extended keymaps 2015-04-25 12:17:18 -04:00
Reed Swiernik 480b313b1e Added keymap w/ game mode 2015-04-25 12:17:07 -04:00
Reed Swiernik bf1987e233 updated makefile 2015-04-25 12:16:51 -04: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
Sean Hunter 4209486b13 Latest custom map with lower + raise 2015-04-02 15:05:35 +01:00
Jack Humbert f1daa266ad macros 2015-03-23 00:35:05 -04:00
Jack Humbert 4454ded0af macros 2015-03-23 00:33:54 -04: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
Jack Humbert a33ec2f504 updated readme 2015-03-21 01:17:22 -04:00
Jack Humbert 3d286a813e colemak shortcuts 2015-03-21 01:01:09 -04:00
Jack Humbert 5c45ba947c function stuff too 2015-03-20 22:49:32 -04:00
Jack Humbert 708f95a472 working extended keymap 2015-03-20 13:36:13 -04:00
Nathan Ross Powell e9df959c13 Update keymap_nathan.c
Remove macro for KEYMAP_GRID that is in keymap_common.h.
Add comments with ASCII art for the two layouts in keymap_common.h.
2015-03-18 23:58:21 -04:00
Nathan Ross Powell e958baca81 Delete .keymap_nathan.c.swp 2015-03-18 23:39:01 -04:00
Nathan Ross Powell 80c4cdb245 Merge remote-tracking branch 'upstream/master' 2015-03-18 23:33:42 -04:00
Jack Humbert 9c3a956634 Update README.md 2015-03-18 10:19:40 -04:00
Jack Humbert 9307a0a3e4 Merge pull request #6 from tmk/master
pulling from tmk
2015-03-16 12:01:35 -04:00
Jack Humbert be86aefdbd Rename handwire-matrix.c to matrix-handwire.c 2015-03-16 11:59:49 -04:00
Jack Humbert a296c83805 Create handwire-matrix.c 2015-03-16 11:59:21 -04:00
Wilba6582 65680819df Replaced tabs with spaces to match TMK convention. 2015-03-17 00:56:41 +11:00
Wilba6582 b80b6b369c Added backlight.h, backlight.c 2015-03-17 00:51:36 +11:00
Wilba6582 15b9bce6ba Initial commit for Planck PCB Rev 1.
- Backlight on PB7 controlled by Timer1 Fast PWM (no interrupts).
- Backlight commands connected temporarily to top left keys.
- Backlight init called from matrix.c, since there's no generic keyboard_init() override function.
2015-03-17 00:43:37 +11:00
Jack Humbert 0fcb3b65f8 brett 2015-03-05 14:29:33 -05:00
Jun Wako c35c4283b9 infinity: For production model and add SpaceFn 2015-03-05 10:38:18 +09:00
Jack Humbert ceff93844b simon 2015-03-02 20:37:17 -05:00
cr3473 a4cf9ae660 layout changes to fix some nav issues
also to simplify and make way for a few ideas
2015-03-01 17:06:39 -05:00
Jack Humbert ea6de22aee brett 2015-02-26 16:35:54 -05:00
Jack Humbert a538f71e41 led oops 2015-02-23 23:44:11 -05:00
Jack Humbert 64dc4784e4 vlad 2015-02-21 15:35:09 -05:00
Jack Humbert 7884125b79 joe 2015-02-19 20:10:24 -05:00
Jack Humbert 88cc5ce883 joe 2015-02-19 19:41:45 -05:00
Jack Humbert cf4363c910 joe 2015-02-19 19:39:35 -05:00
Jack Humbert a4d091eb52 joe 2015-02-19 19:35:57 -05:00
Jack Humbert 4a3c0839f9 sean 2015-02-15 16:29:35 -05:00
pepers b8c91951e1 defined semi-standard and short space layouts 2015-01-27 12:32:23 -05:00
pepers 438ff3465e defined KEYMAP_GRID for grid layouts 2015-01-23 14:17:32 -05:00
Jack Humbert 6cae90793f Create keymap_matthew.c 2015-01-23 12:15:44 -05:00
Jack Humbert 09655cc5d5 Create keymap_nathan.c 2015-01-23 12:14:55 -05:00
Jack Humbert 6f735ca130 Update README.md 2015-01-23 12:11:28 -05: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
Nathan Ross Powell e7289bb029 KC_INSERT should be KC_INS
The short name was incorrectly set as `KC_INT` when we want `KC_INS`.
2015-01-16 00:07:22 -05:00
tmk 099701dd31 hhkb: Integrate RN-42 support, remove hhkb_rn42 2015-01-16 10:21:18 +09:00
Jack Humbert 83a3d7a3da Update README.md 2015-01-15 19:58:38 -05: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
Jack Humbert a7a808795e Update README.md 2015-01-15 13:06:43 -05: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
Jack Humbert a54da1b926 Merge remote-tracking branch 'upstream/master' 2015-01-14 22:48:54 -05:00
Jack Humbert 173dbe3b28 Create keymap_shane.c 2015-01-14 21:36:25 -05:00
Jack Humbert 2e0d872ab7 sean 2015-01-13 18:05:37 -05:00
Jack Humbert 98f486a633 atomic 2015-01-12 12:39:24 -05:00
Jack Humbert 42fe42274f names 2015-01-12 12:37:16 -05:00
Jun Wako 10a6b2c7d8 hhkb: Add Makefile.jp for HHKB JP 2015-01-11 01:54:17 +09:00
Jack Humbert d6f2f878f9 dotcom 2015-01-05 16:32:15 -05:00
Jack Humbert 33e2a6285f dotcom 2015-01-05 16:27:03 -05:00
Jack Humbert 2de53795d6 Update keymap_jack.c 2015-01-05 13:11:34 -05: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
Jack Humbert ed8d9a099d added planck folder 2014-12-14 10:30:27 -05:00
Jack Humbert 79849ee534 Update keymap_common.h 2014-12-12 12:12:36 -05:00
Jack Humbert 4e3397ca8a Update matrix.c 2014-12-12 12:12:06 -05:00
Jack Humbert 4a8b9b8a2e Update keymap_planck.c 2014-12-12 12:11:46 -05:00
charlesmartin 5cc0d353a5 Update keymap_planck.c 2014-12-11 17:41:00 -05:00
Jack Humbert d9a1b9086f led 2014-12-11 17:36:42 -05:00
Jack Humbert 1c6770f18c init 2014-12-08 17:05:41 -05:00
Jack Humbert 6c27cba5df init 2014-12-08 17:05:02 -05: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