Merge pull request #14 from rswiernik/master

Fixed quite a few things
This commit is contained in:
Jack Humbert 2015-04-29 11:02:34 -04:00
commit 03963bad85
15 changed files with 11 additions and 11 deletions

View file

@ -50,7 +50,7 @@ TARGET_DIR = .
# # project specific files
ifdef COMMON_KEYMAP
ifdef COMMON
SRC = keymap_common.c \
matrix_handwire.c \
@ -58,9 +58,9 @@ ifdef COMMON_KEYMAP
backlight.c
ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
SRC := common_keymaps/keymap_$(KEYMAP).c $(SRC)
else
SRC := keymap_jack.c $(SRC)
SRC := common_keymaps/keymap_jack.c $(SRC)
endif
else
@ -71,9 +71,9 @@ SRC = extended_keymap_common.c \
backlight.c
ifdef KEYMAP
SRC := extended_keymap_$(KEYMAP).c $(SRC)
SRC := extended_keymaps/extended_keymap_$(KEYMAP).c $(SRC)
else
SRC := extended_keymap_jack.c $(SRC)
SRC := extended_keymaps/extended_keymap_jack.c $(SRC)
endif
endif

View file

@ -38,10 +38,10 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, MNXT, VOLD, VOLU, MPLY),
[3] = KEYMAP_GRID( /* Reed LOWER */
TRNS , FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, DEL,
TRNS, TRNS, TRNS, PAUSE, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
TRNS, F11, F12, F13, F14, F15, F16, F17, F18, F19, F20, TRNS,
TRNS, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY),
TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, DEL,
TRNS, TRNS, INS, HOME, PGUP, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
TRNS, TRNS, DEL, END, PGDN, F11, F12, F13, TRNS, VOLD, VOLU, TRNS,
TRNS, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS, MPRV, MUTE, MPLY, MNXT),
};
const uint16_t PROGMEM fn_actions[] = {
[1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - RAISE