From 85f8506caa00b06f525fc8e62a9fac2093ab8310 Mon Sep 17 00:00:00 2001 From: Reed Swiernik Date: Wed, 29 Apr 2015 02:47:56 -0400 Subject: [PATCH 1/2] Moved keymap file location and fixed bugs in keymap_reed.c --- keyboard/planck/Makefile | 8 ++++---- keyboard/planck/{ => common_keymaps}/keymap_brett.c | 0 keyboard/planck/{ => common_keymaps}/keymap_dotcom.c | 0 keyboard/planck/{ => common_keymaps}/keymap_jack.c | 0 keyboard/planck/{ => common_keymaps}/keymap_joe.c | 0 .../planck/{ => common_keymaps}/keymap_matthew.c | 0 keyboard/planck/{ => common_keymaps}/keymap_nathan.c | 0 .../planck/{ => common_keymaps}/keymap_peasant.c | 0 keyboard/planck/{ => common_keymaps}/keymap_reed.c | 12 ++++++------ keyboard/planck/{ => common_keymaps}/keymap_sean.c | 0 keyboard/planck/{ => common_keymaps}/keymap_shane.c | 0 keyboard/planck/{ => common_keymaps}/keymap_simon.c | 0 keyboard/planck/{ => common_keymaps}/keymap_tim.c | 0 keyboard/planck/{ => common_keymaps}/keymap_wilba.c | 0 .../{ => extended_keymaps}/extended_keymap_jack.c | 0 15 files changed, 10 insertions(+), 10 deletions(-) rename keyboard/planck/{ => common_keymaps}/keymap_brett.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_dotcom.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_jack.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_joe.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_matthew.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_nathan.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_peasant.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_reed.c (88%) rename keyboard/planck/{ => common_keymaps}/keymap_sean.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_shane.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_simon.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_tim.c (100%) rename keyboard/planck/{ => common_keymaps}/keymap_wilba.c (100%) rename keyboard/planck/{ => extended_keymaps}/extended_keymap_jack.c (100%) diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index ef11e3d3..e32e4f97 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -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 diff --git a/keyboard/planck/keymap_brett.c b/keyboard/planck/common_keymaps/keymap_brett.c similarity index 100% rename from keyboard/planck/keymap_brett.c rename to keyboard/planck/common_keymaps/keymap_brett.c diff --git a/keyboard/planck/keymap_dotcom.c b/keyboard/planck/common_keymaps/keymap_dotcom.c similarity index 100% rename from keyboard/planck/keymap_dotcom.c rename to keyboard/planck/common_keymaps/keymap_dotcom.c diff --git a/keyboard/planck/keymap_jack.c b/keyboard/planck/common_keymaps/keymap_jack.c similarity index 100% rename from keyboard/planck/keymap_jack.c rename to keyboard/planck/common_keymaps/keymap_jack.c diff --git a/keyboard/planck/keymap_joe.c b/keyboard/planck/common_keymaps/keymap_joe.c similarity index 100% rename from keyboard/planck/keymap_joe.c rename to keyboard/planck/common_keymaps/keymap_joe.c diff --git a/keyboard/planck/keymap_matthew.c b/keyboard/planck/common_keymaps/keymap_matthew.c similarity index 100% rename from keyboard/planck/keymap_matthew.c rename to keyboard/planck/common_keymaps/keymap_matthew.c diff --git a/keyboard/planck/keymap_nathan.c b/keyboard/planck/common_keymaps/keymap_nathan.c similarity index 100% rename from keyboard/planck/keymap_nathan.c rename to keyboard/planck/common_keymaps/keymap_nathan.c diff --git a/keyboard/planck/keymap_peasant.c b/keyboard/planck/common_keymaps/keymap_peasant.c similarity index 100% rename from keyboard/planck/keymap_peasant.c rename to keyboard/planck/common_keymaps/keymap_peasant.c diff --git a/keyboard/planck/keymap_reed.c b/keyboard/planck/common_keymaps/keymap_reed.c similarity index 88% rename from keyboard/planck/keymap_reed.c rename to keyboard/planck/common_keymaps/keymap_reed.c index f19957ac..1aa24e10 100644 --- a/keyboard/planck/keymap_reed.c +++ b/keyboard/planck/common_keymaps/keymap_reed.c @@ -33,15 +33,15 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = KEYMAP_GRID( /* Reed RAISE */ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, - TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, + TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, + TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, 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 diff --git a/keyboard/planck/keymap_sean.c b/keyboard/planck/common_keymaps/keymap_sean.c similarity index 100% rename from keyboard/planck/keymap_sean.c rename to keyboard/planck/common_keymaps/keymap_sean.c diff --git a/keyboard/planck/keymap_shane.c b/keyboard/planck/common_keymaps/keymap_shane.c similarity index 100% rename from keyboard/planck/keymap_shane.c rename to keyboard/planck/common_keymaps/keymap_shane.c diff --git a/keyboard/planck/keymap_simon.c b/keyboard/planck/common_keymaps/keymap_simon.c similarity index 100% rename from keyboard/planck/keymap_simon.c rename to keyboard/planck/common_keymaps/keymap_simon.c diff --git a/keyboard/planck/keymap_tim.c b/keyboard/planck/common_keymaps/keymap_tim.c similarity index 100% rename from keyboard/planck/keymap_tim.c rename to keyboard/planck/common_keymaps/keymap_tim.c diff --git a/keyboard/planck/keymap_wilba.c b/keyboard/planck/common_keymaps/keymap_wilba.c similarity index 100% rename from keyboard/planck/keymap_wilba.c rename to keyboard/planck/common_keymaps/keymap_wilba.c diff --git a/keyboard/planck/extended_keymap_jack.c b/keyboard/planck/extended_keymaps/extended_keymap_jack.c similarity index 100% rename from keyboard/planck/extended_keymap_jack.c rename to keyboard/planck/extended_keymaps/extended_keymap_jack.c From 15110bf7a06badecb80dba351bb52fce6588dabe Mon Sep 17 00:00:00 2001 From: Reed Swiernik Date: Wed, 29 Apr 2015 02:49:58 -0400 Subject: [PATCH 2/2] Corrected makefile common var --- keyboard/planck/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index e32e4f97..e021e9e9 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -50,7 +50,7 @@ TARGET_DIR = . # # project specific files -ifdef COMMON_KEYMAP +ifdef COMMON SRC = keymap_common.c \ matrix_handwire.c \