diff options
author | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
---|---|---|
committer | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
commit | e51001efcc3ff8b64f8264e8bd4c2dbea15f3364 (patch) | |
tree | bdf5a0a4b44d5e63ba1376b70d94f64c77f3c90c /tmk_core/readme.md | |
parent | c56693f858cb3409e4a68a8e65a1370c022a51ed (diff) | |
parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) |
Merge remote-tracking branch 'qmk/master'
Diffstat (limited to 'tmk_core/readme.md')
-rw-r--r-- | tmk_core/readme.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/readme.md b/tmk_core/readme.md index f460d0ed44..5f135617c4 100644 --- a/tmk_core/readme.md +++ b/tmk_core/readme.md @@ -23,7 +23,7 @@ These features can be used in your keyboard. * Mouse key - Mouse control with keyboard * System Control Key - Power Down, Sleep, Wake Up and USB Remote Wake up * Media Control Key - Volume Down/Up, Mute, Next/Prev track, Play, Stop and etc -* USB NKRO - 120 keys(+ 8 modifiers) simultaneously +* USB NKRO - 248 keys(+ 8 modifiers) simultaneously * PS/2 mouse support - PS/2 mouse(TrackPoint) as composite device * Keyboard protocols - PS/2, ADB, M0110, Sun and other old keyboard protocols * User Function - Customizable function of key with writing code |