diff options
| author | tmk <tmk@users.noreply.github.com> | 2015-01-25 22:02:34 +0900 |
|---|---|---|
| committer | tmk <tmk@users.noreply.github.com> | 2015-01-25 22:02:34 +0900 |
| commit | e872dd2149330dbbf179a0eb1a4f7de7250c6708 (patch) | |
| tree | ff0d8cbc1fffaf0a4740260e60c701eb7f4ce1b9 | |
| parent | 771347c4a66a8ae1c377310a09d43d5a135ffd14 (diff) | |
| parent | e0f32742e9df2727409c3694c0bab893eb096971 (diff) | |
Merge pull request #176 from xauser/forhasu
NerD bugfix
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | keyboard/nerd/keymap_60_ansi150.c | 2 | ||||
| -rw-r--r-- | keyboard/nerd/keymap_80_ansi150.c | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -55,7 +55,7 @@ You can find some keyboard specific projects under `converter` and `keyboard` di * [Lightsaber](keyboard/lightsaber/) - Korean custom keyboard * [Infinity](keyboard/infinity/) - Massdrop [Infinity keyboard][Infinity] * [NerD](keyboard/nerd/) - Korean custom keyboard -* [KittenPaw](keyboard/kittenpaw) - Custom Majestouch controller +* [KittenPaw](keyboard/kitten_paw) - Custom Majestouch controller * [Lightpad](keyboard/lightpad) - Korean custom keypad * [ghost_squid](keyboard/ghost_squid/) - [The Ghost Squid][ghost_squid] controller for [Cooler Master QuickFire XT][cmxt] diff --git a/keyboard/nerd/keymap_60_ansi150.c b/keyboard/nerd/keymap_60_ansi150.c index c43d195332..f85836ab55 100644 --- a/keyboard/nerd/keymap_60_ansi150.c +++ b/keyboard/nerd/keymap_60_ansi150.c @@ -16,7 +16,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS, FN1, TRNS,FN0, TRNS), /* Layer 2: Functions */ KEYMAP_ANSI150(SLEP,F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, MUTE, \ - TRNS,BTN1,MS_U,BTN3,PSCR,SLCK,BRK, HOME,INS, END, MPLY,VOLD,VOLU,FN3, \ + TRNS,BTN1,MS_U,BTN3,PSCR,SLCK,PAUS,HOME,INS, END, MPLY,VOLD,VOLU,FN3, \ CAPS,MS_L,MS_D,MS_R,PGDN,TRNS,LEFT,DOWN,UP ,RGHT,MPRV,MNXT, FN2, \ UP, TRNS,DEL, TRNS,TRNS,PGUP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ LEFT,DOWN,RGHT, TRNS, TRNS,TRNS,TRNS) diff --git a/keyboard/nerd/keymap_80_ansi150.c b/keyboard/nerd/keymap_80_ansi150.c index a2ba279c55..72a7d83c9b 100644 --- a/keyboard/nerd/keymap_80_ansi150.c +++ b/keyboard/nerd/keymap_80_ansi150.c @@ -3,9 +3,9 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 0: Default */ - KEYMAP_ANSI150(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK, BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME, PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \ + KEYMAP_ANSI150(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, \ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \ + TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \ CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \ LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT, UP, \ LCTL,LGUI,LALT, SPC, RALT,FN0, RCTL, LEFT,DOWN,RGHT), |