summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into ↵tmk2015-01-198-0/+605
|\ | | | | | | | | | | | | vovcacik-ghost_squid Conflicts: README.md
| * Added support for The Ghost Squid controller used for CM XT keyboard.Vlastimil Ovčáčík2014-12-288-0/+605
| | | | | | | | | | | | - initial commit - created as clone of the kitten_paw subproject with pins adjusted for CM XT
* | Merge pull request #164 from cub-uanic/patch-2tmk2015-01-191-0/+1
|\ \ | | | | | | Update other_projects.md - added TMK/Ergodox
| * | Update other_projects.md - added TMK/ErgodoxOleg Kostyuk2015-01-031-0/+1
| | |
* | | Fix typo 'keyobard' #166tmk2015-01-193-3/+3
| | |
* | | Merge branch 'xauser-forhasu'tmk2015-01-1911-0/+753
|\ \ \
| * | | Revert "Changed hotkey for bootloader jump"tmk2015-01-191-1/+1
| | | | | | | | | | | | | | | | This reverts commit f31cbc7219c9a1903331771c10056302817e68ca.
| * | | Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into ↵tmk2015-01-1912-1/+754
|/| | | | | | | | | | | | | | | xauser-forhasu
| * | | Added missing keyboards to main READMERalf Schmitt2015-01-181-0/+2
| | | |
| * | | Added NerD 80% (TKL) supportRalf Schmitt2015-01-1810-111/+149
| | | |
| * | | Added NerD 60% supportRalf Schmitt2015-01-1811-0/+713
| | | |
| * | | Changed hotkey for bootloader jumpRalf Schmitt2015-01-181-1/+1
| | | |
* | | | hhkb: Update RN-42 docstmk2015-01-192-8/+66
|/ / /
* | | Merge branch 'rn42_integrate'tmk2015-01-1632-1047/+73
|\ \ \
| * | | hhkb: Integrate RN-42 support, remove hhkb_rn42tmk2015-01-1632-1004/+69
| | | |
| * | | hhkb_rn42: Move doctmk2015-01-161-43/+4
|/ / /
* | | hhkb: Fix layer stuck of keymap_hasutmk2015-01-161-16/+18
| | | | | | | | | | | | | | | - In mouse key layer with holding semicolon, press Fn0, release semicolon and release Fn0 now layer 1 is stuck.
* | | Merge branch 'rn42'tmk2015-01-1515-692/+1027
|\ \ \
| * | | rn42: Update doctmk2015-01-152-35/+404
| | | |
| * | | Use pgmspace for RN-42 commandstmk2015-01-151-33/+137
| | | |
| * | | Increase buffer of rn42_gets() and change rn42_linked()tmk2015-01-152-6/+6
| | | |
| * | | rn42: Add commands for RN-42tmk2015-01-151-81/+153
| | | |
| * | | rn42: Add rn42_getc and rn42_getstmk2015-01-152-0/+32
| | | |
| * | | Fxi layer stuck of keymap_hasutmk2015-01-151-12/+12
| | | | | | | | | | | | | | | | | | | | - In mouse key layer with holding semicolon, press Fn0, release semicolon and release Fn0 now layer 1 is stuck.
| * | | Update doctmk2015-01-152-451/+128
| | | |
| * | | Change RN42 state displaytmk2015-01-151-18/+24
| | | |
| * | | Fix power saving while USB suspendedtmk2015-01-154-15/+27
| | | | | | | | | | | | | | | | - doesn't pwoer save while Bluetooth turns on
| * | | Add wait for charging capacitance of ADC S/Htmk2015-01-151-0/+1
| | | |
| * | | Fix: enable digital input for PF5tmk2015-01-151-1/+1
| | | |
| * | | Clean ADC code of battery_voltage()tmk2015-01-151-13/+2
| | | |
| * | | Disable input buffer for ADCtmk2015-01-151-0/+4
| | | |
| * | | Update MEMOtmk2015-01-151-2/+56
| | | |
| * | | Add LUFA device state to command infotmk2015-01-151-0/+2
| | | |
| * | | Fix lufa sendchar() infinite wait looptmk2015-01-152-19/+20
| | | | | | | | | | | | | | | | | | | | - FrameNumber is not updated when adapter powered - can be blocked in sendchar() when pluged into AC adapter
| * | | Fix USB plug-in while BT mode falls to be enumeratedtmk2015-01-151-1/+1
| | | |
| * | | Compensate timer during prower downtmk2015-01-156-15/+27
|/ / /
* | | hhkb: Add Makefile.jp for HHKB JPJun Wako2015-01-113-6/+13
| | |
* | | Merge branch 'mbed_infinity'Jun Wako2015-01-0429-99/+1955
|\ \ \ | |/ / |/| |
| * | infinity: Add initial files for keyboard supportJun Wako2015-01-0418-411/+1029
| | |
| * | infinity: Move project specific files to localJun Wako2015-01-047-4/+362
| | |
| * | Fix linker script for NVIC vector on RAMJun Wako2015-01-043-18/+8
| | |
| * | Add openocd config files for K20Jun Wako2015-01-042-0/+137
| | |
| * | Add keyboard/infinityJun Wako2015-01-048-56/+757
| | |
| * | Fix ps2 protocol build using ps2_io.hJun Wako2015-01-042-0/+2
| | |
| * | Update makefiles to mbed-sdk 14666bbJun Wako2015-01-044-87/+127
| | |
| * | Ad hoc fix of print and debug for mbedJun Wako2015-01-042-2/+12
|/ /
* | bluefruit, pjrc: Update protocols for new APItmk2015-01-036-35/+7
| |
* | Fix modifier stuck of Lock command(#127)tmk2015-01-011-0/+1
| |
* | usb_usb: update READMEJun Wako2014-12-301-1/+15
|/
* Merge branch 'mumchristmas-Apple_media_key_fix' #160Jun Wako2014-12-262-4/+11
|\