summaryrefslogtreecommitdiff
path: root/tmk_core/readme.md
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-07-04 12:32:08 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-07-04 12:32:08 -0400
commit2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d (patch)
tree9d8e9c6b71116f01c56c870a9e1071760899ff77 /tmk_core/readme.md
parent44a5f7630f18b40b36270d49449a43cd42b802f0 (diff)
parent9e01b219f32b0086728c10658928b8bffcc26ef7 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/readme.md')
-rw-r--r--tmk_core/readme.md16
1 files changed, 10 insertions, 6 deletions
diff --git a/tmk_core/readme.md b/tmk_core/readme.md
index 6b6714a6a2..f460d0ed44 100644
--- a/tmk_core/readme.md
+++ b/tmk_core/readme.md
@@ -5,6 +5,16 @@ This is a keyboard firmware library with some useful features for Atmel AVR and
Source code is available here: <https://github.com/tmk/tmk_keyboard/tree/core>
+Updates
+-------
+#### 2016/02/10
+flabbergast's Chibios protocol was merged from <https://github.com/flabbergast/tmk_keyboard/tree/chibios>. See [protocol/chibios/README.md](protocol/chibios/README.md). Chibios protocol supports Cortex-M such as STM32 and Kinetis.
+
+#### 2015/04/22
+separated with TMK Keyboard Firmware Collection
+
+
+
Features
--------
These features can be used in your keyboard.
@@ -27,12 +37,6 @@ These features can be used in your keyboard.
-Updates
--------
-2015/04/22 separated with TMK Keyboard Firmware Collection
-
-
-
TMK Keyboard Firmware Collection
--------------------------------
Complete firmwares for various keyboards and protocol converters.