summaryrefslogtreecommitdiffstats
path: root/keyboard/planck
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2015-01-12 12:37:16 -0500
committerJack Humbert <jack.humb@gmail.com>2015-01-12 12:37:16 -0500
commit42fe42274fe0ff2f10698100f28ab686822652ff (patch)
tree768a89a153467795acf4478342abd69c3704f16c /keyboard/planck
parentd6f2f878f90ce033a2495aa9ad82cfa1578429b9 (diff)
names
Diffstat (limited to 'keyboard/planck')
-rw-r--r--keyboard/planck/Makefile2
-rw-r--r--keyboard/planck/keymap_common.h4
-rw-r--r--keyboard/planck/keymap_jack.c8
3 files changed, 7 insertions, 7 deletions
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index 12431cdbed..0d84d8b472 100644
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@ -39,7 +39,7 @@
#----------------------------------------------------------------------------
# Target file name (without extension).
-TARGET = gh60_lufa
+TARGET = planck_lufa
# Directory common source filess exist
TOP_DIR = ../..
diff --git a/keyboard/planck/keymap_common.h b/keyboard/planck/keymap_common.h
index 7c95fb8e7c..264870ef96 100644
--- a/keyboard/planck/keymap_common.h
+++ b/keyboard/planck/keymap_common.h
@@ -41,12 +41,12 @@ extern const uint16_t fn_actions[];
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K33, K34, K36, K37, K38, K39, K3A, K3B \
+ K30, K31, K32, K33, K34, K35, K37, K38, K39, K3A, K3B \
) { \
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B }, \
- { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_NO, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B } \
+ { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_NO, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B } \
}
#endif
diff --git a/keyboard/planck/keymap_jack.c b/keyboard/planck/keymap_jack.c
index d2ad465d78..fd30069ed2 100644
--- a/keyboard/planck/keymap_jack.c
+++ b/keyboard/planck/keymap_jack.c
@@ -2,13 +2,13 @@
const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = KEYMAP( /* Jack */
- TAB, Q, W, E, R, T, Y, U, I, O, P, BSPC,
- ESC, A, S, D, F, G, H, J, K, L, SCLN, QUOT,
+ ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC,
+ TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT,
LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT,
RSFT, LCTL, LALT, LGUI, FN2, SPC, FN1, LEFT, DOWN, UP, RGHT),
[1] = KEYMAP( /* Jack colemak */
- TAB, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC,
- ESC, A, R, S, T, D, H, N, E, I, O, QUOT,
+ ESC, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC,
+ TAB, A, R, S, T, D, H, N, E, I, O, QUOT,
LSFT, Z, X, C, V, B, K, M, COMM, DOT, SLSH, ENT,
FN3, LCTL, LALT, LGUI, FN2, SPC, FN1, LEFT, DOWN, UP, RGHT),
[2] = KEYMAP( /* Jack RAISE */