Merge pull request #14 from rswiernik/master

Fixed quite a few things

15 files changed, 11 insertions, 11 deletions

diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index ef11e3d32b..e021e9e90b 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 \
@@ -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
index 97d832b47a..97d832b47a 100644
--- a/keyboard/planck/keymap_brett.c
+++ b/keyboard/planck/common_keymaps/keymap_brett.c
diff --git a/keyboard/planck/keymap_dotcom.c b/keyboard/planck/common_keymaps/keymap_dotcom.c
index 347f6dea91..347f6dea91 100644
--- a/keyboard/planck/keymap_dotcom.c
+++ b/keyboard/planck/common_keymaps/keymap_dotcom.c
diff --git a/keyboard/planck/keymap_jack.c b/keyboard/planck/common_keymaps/keymap_jack.c
index c74812121f..c74812121f 100644
--- a/keyboard/planck/keymap_jack.c
+++ b/keyboard/planck/common_keymaps/keymap_jack.c
diff --git a/keyboard/planck/keymap_joe.c b/keyboard/planck/common_keymaps/keymap_joe.c
index 07122b702c..07122b702c 100644
--- a/keyboard/planck/keymap_joe.c
+++ b/keyboard/planck/common_keymaps/keymap_joe.c
diff --git a/keyboard/planck/keymap_matthew.c b/keyboard/planck/common_keymaps/keymap_matthew.c
index 56e7003a97..56e7003a97 100644
--- a/keyboard/planck/keymap_matthew.c
+++ b/keyboard/planck/common_keymaps/keymap_matthew.c
diff --git a/keyboard/planck/keymap_nathan.c b/keyboard/planck/common_keymaps/keymap_nathan.c
index 5a0900b66d..5a0900b66d 100644
--- a/keyboard/planck/keymap_nathan.c
+++ b/keyboard/planck/common_keymaps/keymap_nathan.c
diff --git a/keyboard/planck/keymap_peasant.c b/keyboard/planck/common_keymaps/keymap_peasant.c
index ddacb614e6..ddacb614e6 100644
--- a/keyboard/planck/keymap_peasant.c
+++ b/keyboard/planck/common_keymaps/keymap_peasant.c
diff --git a/keyboard/planck/keymap_reed.c b/keyboard/planck/common_keymaps/keymap_reed.c
index f19957ac5c..1aa24e10de 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
index 4fe07f701a..4fe07f701a 100644
--- a/keyboard/planck/keymap_sean.c
+++ b/keyboard/planck/common_keymaps/keymap_sean.c
diff --git a/keyboard/planck/keymap_shane.c b/keyboard/planck/common_keymaps/keymap_shane.c
index d4e40fe63a..d4e40fe63a 100644
--- a/keyboard/planck/keymap_shane.c
+++ b/keyboard/planck/common_keymaps/keymap_shane.c
diff --git a/keyboard/planck/keymap_simon.c b/keyboard/planck/common_keymaps/keymap_simon.c
index 37951364be..37951364be 100644
--- a/keyboard/planck/keymap_simon.c
+++ b/keyboard/planck/common_keymaps/keymap_simon.c
diff --git a/keyboard/planck/keymap_tim.c b/keyboard/planck/common_keymaps/keymap_tim.c
index 7444f3877b..7444f3877b 100644
--- a/keyboard/planck/keymap_tim.c
+++ b/keyboard/planck/common_keymaps/keymap_tim.c
diff --git a/keyboard/planck/keymap_wilba.c b/keyboard/planck/common_keymaps/keymap_wilba.c
index 9781f8fcd8..9781f8fcd8 100644
--- a/keyboard/planck/keymap_wilba.c
+++ b/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
index 416ae83450..416ae83450 100644
--- a/keyboard/planck/extended_keymap_jack.c
+++ b/keyboard/planck/extended_keymaps/extended_keymap_jack.c