From db32864ce7029d758f57729cc2f75e051a28d0a2 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 18 Jun 2016 14:30:24 -0400 Subject: Cleans up quantum/keymap situation, removes extra lufa folders (#416) * sorts out keycodes * move midi around * remove mbed * replaces keymap with qmk/keymap_common * fixes keymap.h * keymap, config, quantum rearrange * removes unneeded lufa stuff --- keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c | 2 +- keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c | 2 +- keyboard/planck/old_keymap_files/keymap_common.c | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) (limited to 'keyboard/planck/old_keymap_files') diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c index 97d832b47..3ebd82af4 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c index 347f6dea9..d4ec987ab 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c index c74812121..4237949d5 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( /* Jack */ diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c index 598b0c455..b8251c857 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( /* Joe qwerty */ diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c index 56e7003a9..196b2d777 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c @@ -20,7 +20,7 @@ `-----------------------------------------------------------------------------------------------' */ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 0: dvorak */ diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c index f7df7bbba..e5a86b402 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c index 5a0900b66..f0be4b030 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c @@ -1,7 +1,7 @@ // Author: Nathan Ross Powell // https://github.com/nathanrosspowell/tmk_keyboard/blob/planck-jack/keyboard/planck/keymap_nathan.c -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 0: main layer diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c index 49c90e019..51d45be75 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( /* Paul */ diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c index ddacb614e..f6493e33a 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( /* Native */ diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c index 1aa24e10d..6cc6e5d7a 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" /* * BUILD: diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c index cb2ef8f13..fb0eb7dad 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( /* Matrix Dvorak */ diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c index 8d5ad6875..2191758c8 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" #include "action_layer.h" #include "action.h" #include "action_util.h" diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c index 37951364b..8058c2e10 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( /* Jack */ diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c index 7444f3877..64d0b7403 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c b/keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c index 9781f8fcd..22326ebe4 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c +++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c @@ -1,4 +1,4 @@ -#include "keymap_common.h" +#include "keymap.h" const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( /* Wilba */ diff --git a/keyboard/planck/old_keymap_files/keymap_common.c b/keyboard/planck/old_keymap_files/keymap_common.c index fdb1769e1..db4f18a95 100644 --- a/keyboard/planck/old_keymap_files/keymap_common.c +++ b/keyboard/planck/old_keymap_files/keymap_common.c @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "keymap_common.h" +#include "keymap.h" /* translates key to keycode */ -- cgit v1.2.3