varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

Updated makefile to properly handle non extended keymaps

Browse source
This commit is contained in:
Reed Swiernik 2015-04-23 04:31:39 -04:00
parent 480b313b1e
commit 0541af4ff9
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
keyboard/planck/Makefile
View file

@ -47,9 +47,12 @@ TOP_DIR = ../..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
# # project specific files # # project specific files
ifdef COMMON ifdef COMMON_KEYMAP
SRC = keymap_common.c \
SRC = keymap_common.c \
matrix_handwire.c \ matrix_handwire.c \
led.c \ led.c \
backlight.c backlight.c
@ -62,9 +65,7 @@ endif
else else
# project specific files SRC = extended_keymap_common.c \
SRC = extended_keymap_common.c \
matrix_handwire.c \ matrix_handwire.c \
led.c \ led.c \
backlight.c backlight.c

20
keyboard/planck/keymap_reed.c
View file

@ -1,8 +1,15 @@
#include "keymap_common.h" #include "keymap_common.h"
/* /*
* make KEYMAP=reed COMMON_KEYMAP=true
*
*
* This layout works off of Jack's layout, making some changes that I * This layout works off of Jack's layout, making some changes that I
* feel significantly improve the function of the keyboard. * feel significantly improve the function of the keyboard. Major changes
* include adding a "gaming mode" that will allow users to still access
* the number keys 1 through 4 easily for games that require it. Also
* included is the ability to use the tap/hold function for easy use of
* right shift and thumb shift with their tapped companions.
* *
*/ */
const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@ -21,22 +28,23 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[2] = KEYMAP_GRID( /* Reed RAISE */ [2] = KEYMAP_GRID( /* Reed RAISE */
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, DEL, GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, DEL,
TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS,
TRNS, F11, F12, F13, F14, F15, F16, F17, F18, F19, F20, TRNS, TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS,
TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, MNXT, VOLD, VOLU, MPLY), TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, MNXT, VOLD, VOLU, MPLY),
[3] = KEYMAP_GRID( /* Reed LOWER */ [3] = KEYMAP_GRID( /* Reed LOWER */
TRNS , FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC, TRNS , FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC,
TRNS, TRNS, TRNS, PAUSE, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, TRNS, TRNS, TRNS, PAUSE, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, 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, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY),
}; };
const uint16_t PROGMEM fn_actions[] = { const uint16_t PROGMEM fn_actions[] = {
[1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay RAISE [1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - RAISE
[2] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay LOWER [2] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay - LOWER
[3] = ACTION_DEFAULT_LAYER_SET(0), [3] = ACTION_DEFAULT_LAYER_SET(0),
[4] = ACTION_DEFAULT_LAYER_SET(1), [4] = ACTION_DEFAULT_LAYER_SET(1),
[5] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ENT), // Actions for the tap/hold modifiers listed above
[5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT),
[7] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPC), [7] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPC),
[10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),