summaryrefslogtreecommitdiffstats
path: root/readme.md
diff options
context:
space:
mode:
authorOle Anders <git@swoy.org>2017-03-28 15:55:33 +0200
committerOle Anders <git@swoy.org>2017-03-28 15:55:33 +0200
commit62faa20ef6ddab7dacc74123b2253cf25b5c20f7 (patch)
tree281ae30283f7491b2529465da4897dc2ddd7088c /readme.md
parentd5ee0194abf5cc9df4086a89ad78cf188352028a (diff)
parent5e4daf1c6db980fad269fe7b013205008bfe701e (diff)
downloadqmk_firmware-62faa20ef6ddab7dacc74123b2253cf25b5c20f7.tar.gz
qmk_firmware-62faa20ef6ddab7dacc74123b2253cf25b5c20f7.tar.xz
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'readme.md')
-rw-r--r--readme.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/readme.md b/readme.md
index 71f756667..b2dfc5f75 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
# Quantum Mechanical Keyboard Firmware
-[![Build Status](https://travis-ci.org/jackhumbert/qmk_firmware.svg?branch=master)](https://travis-ci.org/jackhumbert/qmk_firmware) [![Gitter](https://badges.gitter.im/qmk/qmk_firmware.svg)](https://gitter.im/qmk/qmk_firmware?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Build Status](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Gitter](https://badges.gitter.im/qmk/qmk_firmware.svg)](https://gitter.im/qmk/qmk_firmware?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
This is a keyboard firmware based on the [tmk_keyboard firmware](http://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR controllers, and more specifically, the [OLKB product line](http://olkb.com), the [ErgoDox EZ](http://www.ergodox-ez.com) keyboard, and the [Clueboard product line](http://clueboard.co/).
@@ -35,5 +35,5 @@ This is not a tiny project. While this is the main readme, there are many other
* The readme for your own keyboard: This is found under `keyboards/<your keyboards's name>/`. So for the ErgoDox EZ, it's [here](keyboards/ergodox/ez/); for the Planck, it's [here](keyboards/planck/) and so on.
* The list of possible keycodes you can use in your keymap is actually spread out in a few different places:
* [doc/keycode.txt](doc/keycode.txt) - an explanation of those same keycodes.
- * [quantum/keymap.h](quantum/keymap.h) - this is where the QMK-specific aliases are all set up. Things like the Hyper and Meh key, the Leader key, and all of the other QMK innovations. These are also explained and documented below, but `keymap.h` is where they're actually defined.
+ * [quantum/quantum_keycodes.h](quantum/quantum_keycodes.h) - this is where the QMK-specific aliases are all set up. Things like the Hyper and Meh key, the Leader key, and all of the other QMK innovations. These are also explained and documented below, but `quantum_keycodes.h` is where they're actually defined.
* The [TMK documentation](doc/TMK_README.md). QMK is based on TMK, and this explains how it works internally.