diff options
| author | cr3473 <joe@createtank.com> | 2015-05-27 08:29:48 -0700 |
|---|---|---|
| committer | cr3473 <joe@createtank.com> | 2015-05-27 08:29:48 -0700 |
| commit | b36d1a87da2395fd5429e2817409c76f065387b5 (patch) | |
| tree | 1e4a76822deaf92db83896548fa3c3003f7640f3 /doc | |
| parent | a4cf9ae660b16d1952738139ba8f788368b73eff (diff) | |
| parent | d61d1f5ca3a7dcccc495ac6688e0632c601c0623 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/keycode.txt | 2 | ||||
| -rw-r--r-- | doc/other_projects.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/keycode.txt b/doc/keycode.txt index 4137566924..760c726e3b 100644 --- a/doc/keycode.txt +++ b/doc/keycode.txt @@ -81,7 +81,7 @@ KC_F12 45 Keyboard F12 KC_PSCREEN KC_PSCR 46 Keyboard PrintScreen1 KC_SCKLOCK KC_SLCK 47 Keyboard Scroll Lock11 KC_PAUSE KC_PAUS 48 Keyboard Pause1 -KC_INSERT KC_INT 49 Keyboard Insert1 +KC_INSERT KC_INS 49 Keyboard Insert1 KC_HOME 4A Keyboard Home1 KC_PGUP 4B Keyboard PageUp1 KC_DELETE KC_DELETE 4C Keyboard Delete Forward diff --git a/doc/other_projects.md b/doc/other_projects.md index ce24e0ab5c..bf980b0a9e 100644 --- a/doc/other_projects.md +++ b/doc/other_projects.md @@ -29,6 +29,7 @@ Other Keyboard Firmware Projects ## ErgoDox[Ergo][Split][USB][AVR] - <http://geekhack.org/index.php?topic=22780.0> - <https://github.com/benblazak/ergodox-firmware> +- <https://github.com/cub-uanic/tmk_keyboard> ## Suka's keyboard collection[Ergo][Split][3DPrinting][USB][AVR] - <http://deskthority.net/workshop-f7/my-diy-keyboard-collection-or-how-i-became-a-kb-geek-t2534.html> |